Adjusted C declarations to the changed static driver names.

This commit is contained in:
Oliver Schmidt
2013-05-09 10:20:03 +02:00
parent 54c54f8499
commit 44fd1082ae
14 changed files with 96 additions and 78 deletions

View File

@@ -142,12 +142,14 @@ extern unsigned char _filetype; /* Default 6 */
extern unsigned int _auxtype; /* Default 0 */ extern unsigned int _auxtype; /* Default 0 */
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void apple2_auxmem[]; #ifndef __APPLE2ENH__
extern void apple2_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void a2_auxmem_emd[];
extern void apple2_stdmou[]; /* Referred to by mouse_static_stddrv[] */ extern void a2_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void apple2_ssc[]; extern void a2_stdmou_mou[]; /* Referred to by mouse_static_stddrv[] */
extern void apple2_280_192_8[]; /* Referred to by tgi_static_stddrv[] */ extern void a2_ssc_ser[];
extern void apple2_40_48_16[]; extern void a2_hi_tgi[]; /* Referred to by tgi_static_stddrv[] */
extern void a2_lo_tgi[];
#endif

View File

@@ -84,6 +84,22 @@
/*****************************************************************************/
/* Variables */
/*****************************************************************************/
/* The addresses of the static drivers */
extern void a2e_auxmem_emd[];
extern void a2e_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void a2e_stdmou_mou[]; /* Referred to by mouse_static_stddrv[] */
extern void a2e_ssc_ser[];
extern void a2e_hi_tgi[]; /* Referred to by tgi_static_stddrv[] */
extern void a2e_lo_tgi[];
/*****************************************************************************/ /*****************************************************************************/
/* Code */ /* Code */
/*****************************************************************************/ /*****************************************************************************/

View File

@@ -151,24 +151,24 @@ extern char *_getdefdev(void); /* get default floppy device */
/* global variables */ /* global variables */
extern unsigned char _dos_type; /* the DOS flavour */ extern unsigned char _dos_type; /* the DOS flavour */
extern void atari_130xe[]; extern void atr130xe_emd[];
extern void atari_stdjoy[]; /* referred to by joy_static_stddrv[] */ extern void ataristd_joy[]; /* referred to by joy_static_stddrv[] */
extern void atari_multijoy[]; extern void atarim8_joy[];
extern void atari_10[]; extern void atari10_tgi[];
extern void atari_10p2[]; extern void atr10p2_tgi[];
extern void atari_11[]; extern void atari11_tgi[];
extern void atari_14[]; extern void atari14_tgi[];
extern void atari_15[]; extern void atari15_tgi[];
extern void atari_15p2[]; extern void atr15p2_tgi[];
extern void atari_3[]; extern void atari3_tgi[];
extern void atari_4[]; extern void atari4_tgi[];
extern void atari_5[]; extern void atari5_tgi[];
extern void atari_6[]; extern void atari6_tgi[];
extern void atari_7[]; extern void atari7_tgi[];
extern void atari_8[]; /* referred to by tgi_static_stddrv[] */ extern void atari8_tgi[]; /* referred to by tgi_static_stddrv[] */
extern void atari_8p2[]; extern void atr8p2_tgi[];
extern void atari_9[]; extern void atari9_tgi[];
extern void atari_9p2[]; extern void atr9p2_tgi[];
/* provide old names for backwards compatibility */ /* provide old names for backwards compatibility */
#ifdef ATARI_COMPAT_PRE_2_11 #ifdef ATARI_COMPAT_PRE_2_11

View File

@@ -119,10 +119,10 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void atmos_pase[]; /* Referred to by joy_static_stddrv[] */ extern void atmos_pase_joy[]; /* Referred to by joy_static_stddrv[] */
extern void atmos_acia[]; extern void atmos_acia_ser[];
extern void atmos_228_200_3[]; extern void atmos_228_200_3_tgi[];
extern void atmos_240_200_2[]; /* Referred to by tgi_static_stddrv[] */ extern void atmos_240_200_2_tgi[]; /* Referred to by tgi_static_stddrv[] */

View File

@@ -121,20 +121,20 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void c128_georam[]; extern void c128_georam_emd[];
extern void c128_ram[]; extern void c128_ram_emd[];
extern void c128_ram2[]; extern void c128_ram2_emd[];
extern void c128_ramcart[]; extern void c128_ramcart_emd[];
extern void c128_reu[]; extern void c128_reu_emd[];
extern void c128_vdc[]; extern void c128_vdc_emd[];
extern void c128_ptvjoy[]; extern void c128_ptvjoy_joy[];
extern void c128_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void c128_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void c128_1351[]; /* Referred to by mouse_static_stddrv[] */ extern void c128_1351_mous[]; /* Referred to by mouse_static_stddrv[] */
extern void c128_joymouse[]; extern void c128_joy_mou[];
extern void c128_potmouse[]; extern void c128_pot_mou[];
extern void c128_swlink[]; extern void c128_swlink_ser[];
extern void c128_640_200_2[]; /* Referred to by tgi_static_stddrv[] */ extern void c128_vdc_tgi[]; /* Referred to by tgi_static_stddrv[] */
extern void c128_640_480_2[]; extern void c128_vdc2_tgi[];

View File

@@ -54,8 +54,8 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void c16_ram[]; extern void c16_ram_emd[];
extern void c16_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void c16_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */

View File

@@ -130,24 +130,24 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void c64_c256k[]; extern void c64_c256k_emd[];
extern void c64_dqbb[]; extern void c64_dqbb_emd[];
extern void c64_georam[]; extern void c64_georam_emd[];
extern void c64_isepic[]; extern void c64_isepic_emd[];
extern void c64_ram[]; extern void c64_ram_emd[];
extern void c64_ramcart[]; extern void c64_ramcart_emd[];
extern void c64_reu[]; extern void c64_reu_emd[];
extern void c64_vdc[]; extern void c64_vdc_emd[];
extern void dtv_himem[]; extern void dtv_himem_emd[];
extern void c64_hitjoy[]; extern void c64_hitjoy_joy[];
extern void c64_numpad[]; extern void c64_numpad_joy[];
extern void c64_ptvjoy[]; extern void c64_ptvjoy_joy[];
extern void c64_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void c64_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void c64_1351[]; /* Referred to by mouse_static_stddrv[] */ extern void c64_1351_mou[]; /* Referred to by mouse_static_stddrv[] */
extern void c64_joymouse[]; extern void c64_joy_mou[];
extern void c64_potmouse[]; extern void c64_pot_mou[];
extern void c64_swlink[]; extern void c64_swlink_ser[];
extern void c64_320_200_2[]; /* Referred to by tgi_static_stddrv[] */ extern void c64_hi_tgi[]; /* Referred to by tgi_static_stddrv[] */

View File

@@ -118,9 +118,9 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void cbm510_ram[]; extern void cbm510_ram_emd[];
extern void cbm510_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void cbm510_std_joy[]; /* Referred to by joy_static_stddrv[] */
extern void cbm510_stdser[]; extern void cbm510_std_ser[];

View File

@@ -103,8 +103,8 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void cbm610_ram[]; extern void cbm610_ram_emd[];
extern void cbm610_stdser[]; extern void cbm610_std_ser[];

View File

@@ -99,9 +99,9 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void lynx_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void lynx_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void lynx_comlynx[]; extern void lynx_comlynx_ser[];
extern void lynx_160_102_16[]; /* Referred to by tgi_static_stddrv[] */ extern void lynx_160_102_16_tgi[]; /* Referred to by tgi_static_stddrv[] */

View File

@@ -93,8 +93,8 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void nes_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void nes_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void nes_64_56_2[]; /* Referred to by tgi_static_stddrv[] */ extern void nes_64_56_2_tgi[]; /* Referred to by tgi_static_stddrv[] */

View File

@@ -80,8 +80,8 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void pet_ptvjoy[]; extern void pet_ptvjoy_joy[];
extern void pet_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void pet_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */

View File

@@ -58,8 +58,8 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void plus4_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void plus4_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void plus4_stdser[]; extern void plus4_stdser_ser[];

View File

@@ -93,8 +93,8 @@
/* The addresses of the static drivers */ /* The addresses of the static drivers */
extern void vic20_ptvjoy[]; extern void vic20_ptvjoy_joy[];
extern void vic20_stdjoy[]; /* Referred to by joy_static_stddrv[] */ extern void vic20_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */