Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Remove apparently unused/unneeded js_timelimit

Browse Source
This commit is contained in:
Aaron Culliney 2013-12-29 10:58:43 -08:00
parent 70cded47f8
commit 760a409762
5 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.apple2
View File

@ -6,5 +6,5 @@ color = interpolated
volume = 8
joystick = joy keypad
system path = /usr/local/games/apple2/rom
pc joystick parms = 128 128 255 1 255 1 6
pc joystick parms = 128 128 255 1 255 1
keypad joystick parms = 8 1

5
src/interface.c
View File

@ -71,11 +71,6 @@ static void pad_string(char *s, const char c, const int len) {
/* in keys.c */
//extern void c_mouse_close();
#ifdef PC_JOYSTICK
extern long js_timelimit;
#endif
/* -------------------------------------------------------------------------
c_load_interface_font()
------------------------------------------------------------------------- */

9
src/joystick.c
View File

@ -46,7 +46,6 @@ uint8_t auto_recenter = 0;
#ifdef PC_JOYSTICK
int js_center_x;
int js_center_y;
long js_timelimit;
int js_max_x;
int js_max_y;
int js_min_x;
@ -72,7 +71,7 @@ float
js_adjusthigh_y;
/* -------------------------------------------------------------------------
c_open_pc_joystick() - opens joystick device and sets timelimit value
c_open_pc_joystick() - opens joystick device
------------------------------------------------------------------------- */
static void c_calculate_pc_joystick_parms();
int c_open_pc_joystick()
@ -91,12 +90,6 @@ int c_open_pc_joystick()
}
}
}
/* set timelimit value */
if (ioctl(js_fd, JS_SET_TIMELIMIT, &js_timelimit) == -1)
{
return 1; /* problem */
}
}
c_calculate_pc_joystick_parms();

12
src/prefs.c
View File

@ -286,7 +286,7 @@ void load_settings(void)
#ifdef PC_JOYSTICK
/* pc joystick parms generated by the calibration routine
(shouldn't need to hand tweak these) = origin_x origin_y max_x
min_x max_y min_y js_timelimit */
min_x max_y min_y */
js_center_x = strtol(argument, &argument, 10);
js_center_y = strtol(argument, &argument, 10);
js_max_x = strtol(argument, &argument, 10);
@ -313,12 +313,6 @@ void load_settings(void)
js_min_y = 0;
}
js_timelimit = strtol(argument, &argument, 10);
if (js_timelimit < 2)
{
js_timelimit = 2;
}
c_open_joystick();
break;
#endif
@ -409,9 +403,9 @@ bool save_settings(void)
#ifdef PC_JOYSTICK
err = fprintf(config_file,
"pc joystick parms = %d %d %d %d %d %d %ld\n",
"pc joystick parms = %d %d %d %d %d %d\n",
js_center_x, js_center_y, js_max_x, js_min_x,
js_max_y, js_min_y, js_timelimit);
js_max_y, js_min_y);
#endif
anErr = anErr || (err < 0);

1
src/prefs.h
View File

@ -62,7 +62,6 @@ extern uint8_t auto_recenter;
/* real joystick settings */
extern int js_center_x;
extern int js_center_y;
extern long js_timelimit;
extern int js_max_x;
extern int js_max_y;
extern int js_min_x;