From 44fd1082ae807a0b6b4046c65914e20a7e27101c Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Thu, 9 May 2013 10:20:03 +0200 Subject: [PATCH] Adjusted C declarations to the changed static driver names. --- include/apple2.h | 14 ++++++++------ include/apple2enh.h | 16 ++++++++++++++++ include/atari.h | 36 ++++++++++++++++++------------------ include/atmos.h | 8 ++++---- include/c128.h | 28 ++++++++++++++-------------- include/c16.h | 4 ++-- include/c64.h | 36 ++++++++++++++++++------------------ include/cbm510.h | 6 +++--- include/cbm610.h | 4 ++-- include/lynx.h | 6 +++--- include/nes.h | 4 ++-- include/pet.h | 4 ++-- include/plus4.h | 4 ++-- include/vic20.h | 4 ++-- 14 files changed, 96 insertions(+), 78 deletions(-) diff --git a/include/apple2.h b/include/apple2.h index 89bee060a..f5dcff0ae 100644 --- a/include/apple2.h +++ b/include/apple2.h @@ -142,12 +142,14 @@ extern unsigned char _filetype; /* Default 6 */ extern unsigned int _auxtype; /* Default 0 */ /* The addresses of the static drivers */ -extern void apple2_auxmem[]; -extern void apple2_stdjoy[]; /* Referred to by joy_static_stddrv[] */ -extern void apple2_stdmou[]; /* Referred to by mouse_static_stddrv[] */ -extern void apple2_ssc[]; -extern void apple2_280_192_8[]; /* Referred to by tgi_static_stddrv[] */ -extern void apple2_40_48_16[]; +#ifndef __APPLE2ENH__ +extern void a2_auxmem_emd[]; +extern void a2_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ +extern void a2_stdmou_mou[]; /* Referred to by mouse_static_stddrv[] */ +extern void a2_ssc_ser[]; +extern void a2_hi_tgi[]; /* Referred to by tgi_static_stddrv[] */ +extern void a2_lo_tgi[]; +#endif diff --git a/include/apple2enh.h b/include/apple2enh.h index 297039d18..112522117 100644 --- a/include/apple2enh.h +++ b/include/apple2enh.h @@ -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 */ /*****************************************************************************/ diff --git a/include/atari.h b/include/atari.h index c4c048f29..555dc9a93 100644 --- a/include/atari.h +++ b/include/atari.h @@ -151,24 +151,24 @@ extern char *_getdefdev(void); /* get default floppy device */ /* global variables */ extern unsigned char _dos_type; /* the DOS flavour */ -extern void atari_130xe[]; -extern void atari_stdjoy[]; /* referred to by joy_static_stddrv[] */ -extern void atari_multijoy[]; -extern void atari_10[]; -extern void atari_10p2[]; -extern void atari_11[]; -extern void atari_14[]; -extern void atari_15[]; -extern void atari_15p2[]; -extern void atari_3[]; -extern void atari_4[]; -extern void atari_5[]; -extern void atari_6[]; -extern void atari_7[]; -extern void atari_8[]; /* referred to by tgi_static_stddrv[] */ -extern void atari_8p2[]; -extern void atari_9[]; -extern void atari_9p2[]; +extern void atr130xe_emd[]; +extern void ataristd_joy[]; /* referred to by joy_static_stddrv[] */ +extern void atarim8_joy[]; +extern void atari10_tgi[]; +extern void atr10p2_tgi[]; +extern void atari11_tgi[]; +extern void atari14_tgi[]; +extern void atari15_tgi[]; +extern void atr15p2_tgi[]; +extern void atari3_tgi[]; +extern void atari4_tgi[]; +extern void atari5_tgi[]; +extern void atari6_tgi[]; +extern void atari7_tgi[]; +extern void atari8_tgi[]; /* referred to by tgi_static_stddrv[] */ +extern void atr8p2_tgi[]; +extern void atari9_tgi[]; +extern void atr9p2_tgi[]; /* provide old names for backwards compatibility */ #ifdef ATARI_COMPAT_PRE_2_11 diff --git a/include/atmos.h b/include/atmos.h index 66245227d..e4c2af9b2 100644 --- a/include/atmos.h +++ b/include/atmos.h @@ -119,10 +119,10 @@ /* The addresses of the static drivers */ -extern void atmos_pase[]; /* Referred to by joy_static_stddrv[] */ -extern void atmos_acia[]; -extern void atmos_228_200_3[]; -extern void atmos_240_200_2[]; /* Referred to by tgi_static_stddrv[] */ +extern void atmos_pase_joy[]; /* Referred to by joy_static_stddrv[] */ +extern void atmos_acia_ser[]; +extern void atmos_228_200_3_tgi[]; +extern void atmos_240_200_2_tgi[]; /* Referred to by tgi_static_stddrv[] */ diff --git a/include/c128.h b/include/c128.h index 4d4cb9769..26fb25274 100644 --- a/include/c128.h +++ b/include/c128.h @@ -121,20 +121,20 @@ /* The addresses of the static drivers */ -extern void c128_georam[]; -extern void c128_ram[]; -extern void c128_ram2[]; -extern void c128_ramcart[]; -extern void c128_reu[]; -extern void c128_vdc[]; -extern void c128_ptvjoy[]; -extern void c128_stdjoy[]; /* Referred to by joy_static_stddrv[] */ -extern void c128_1351[]; /* Referred to by mouse_static_stddrv[] */ -extern void c128_joymouse[]; -extern void c128_potmouse[]; -extern void c128_swlink[]; -extern void c128_640_200_2[]; /* Referred to by tgi_static_stddrv[] */ -extern void c128_640_480_2[]; +extern void c128_georam_emd[]; +extern void c128_ram_emd[]; +extern void c128_ram2_emd[]; +extern void c128_ramcart_emd[]; +extern void c128_reu_emd[]; +extern void c128_vdc_emd[]; +extern void c128_ptvjoy_joy[]; +extern void c128_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ +extern void c128_1351_mous[]; /* Referred to by mouse_static_stddrv[] */ +extern void c128_joy_mou[]; +extern void c128_pot_mou[]; +extern void c128_swlink_ser[]; +extern void c128_vdc_tgi[]; /* Referred to by tgi_static_stddrv[] */ +extern void c128_vdc2_tgi[]; diff --git a/include/c16.h b/include/c16.h index 7124d51ae..35124a709 100644 --- a/include/c16.h +++ b/include/c16.h @@ -54,8 +54,8 @@ /* The addresses of the static drivers */ -extern void c16_ram[]; -extern void c16_stdjoy[]; /* Referred to by joy_static_stddrv[] */ +extern void c16_ram_emd[]; +extern void c16_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ diff --git a/include/c64.h b/include/c64.h index f976fab8f..5cc2bd08e 100644 --- a/include/c64.h +++ b/include/c64.h @@ -130,24 +130,24 @@ /* The addresses of the static drivers */ -extern void c64_c256k[]; -extern void c64_dqbb[]; -extern void c64_georam[]; -extern void c64_isepic[]; -extern void c64_ram[]; -extern void c64_ramcart[]; -extern void c64_reu[]; -extern void c64_vdc[]; -extern void dtv_himem[]; -extern void c64_hitjoy[]; -extern void c64_numpad[]; -extern void c64_ptvjoy[]; -extern void c64_stdjoy[]; /* Referred to by joy_static_stddrv[] */ -extern void c64_1351[]; /* Referred to by mouse_static_stddrv[] */ -extern void c64_joymouse[]; -extern void c64_potmouse[]; -extern void c64_swlink[]; -extern void c64_320_200_2[]; /* Referred to by tgi_static_stddrv[] */ +extern void c64_c256k_emd[]; +extern void c64_dqbb_emd[]; +extern void c64_georam_emd[]; +extern void c64_isepic_emd[]; +extern void c64_ram_emd[]; +extern void c64_ramcart_emd[]; +extern void c64_reu_emd[]; +extern void c64_vdc_emd[]; +extern void dtv_himem_emd[]; +extern void c64_hitjoy_joy[]; +extern void c64_numpad_joy[]; +extern void c64_ptvjoy_joy[]; +extern void c64_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ +extern void c64_1351_mou[]; /* Referred to by mouse_static_stddrv[] */ +extern void c64_joy_mou[]; +extern void c64_pot_mou[]; +extern void c64_swlink_ser[]; +extern void c64_hi_tgi[]; /* Referred to by tgi_static_stddrv[] */ diff --git a/include/cbm510.h b/include/cbm510.h index 1ced386b7..19370d818 100644 --- a/include/cbm510.h +++ b/include/cbm510.h @@ -118,9 +118,9 @@ /* The addresses of the static drivers */ -extern void cbm510_ram[]; -extern void cbm510_stdjoy[]; /* Referred to by joy_static_stddrv[] */ -extern void cbm510_stdser[]; +extern void cbm510_ram_emd[]; +extern void cbm510_std_joy[]; /* Referred to by joy_static_stddrv[] */ +extern void cbm510_std_ser[]; diff --git a/include/cbm610.h b/include/cbm610.h index aa401c205..523b49577 100644 --- a/include/cbm610.h +++ b/include/cbm610.h @@ -103,8 +103,8 @@ /* The addresses of the static drivers */ -extern void cbm610_ram[]; -extern void cbm610_stdser[]; +extern void cbm610_ram_emd[]; +extern void cbm610_std_ser[]; diff --git a/include/lynx.h b/include/lynx.h index 632e32f1e..ec1a8c464 100644 --- a/include/lynx.h +++ b/include/lynx.h @@ -99,9 +99,9 @@ /* The addresses of the static drivers */ -extern void lynx_stdjoy[]; /* Referred to by joy_static_stddrv[] */ -extern void lynx_comlynx[]; -extern void lynx_160_102_16[]; /* Referred to by tgi_static_stddrv[] */ +extern void lynx_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ +extern void lynx_comlynx_ser[]; +extern void lynx_160_102_16_tgi[]; /* Referred to by tgi_static_stddrv[] */ diff --git a/include/nes.h b/include/nes.h index 464161093..46219b3de 100644 --- a/include/nes.h +++ b/include/nes.h @@ -93,8 +93,8 @@ /* The addresses of the static drivers */ -extern void nes_stdjoy[]; /* Referred to by joy_static_stddrv[] */ -extern void nes_64_56_2[]; /* Referred to by tgi_static_stddrv[] */ +extern void nes_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ +extern void nes_64_56_2_tgi[]; /* Referred to by tgi_static_stddrv[] */ diff --git a/include/pet.h b/include/pet.h index 0b11efd43..24e937c5a 100644 --- a/include/pet.h +++ b/include/pet.h @@ -80,8 +80,8 @@ /* The addresses of the static drivers */ -extern void pet_ptvjoy[]; -extern void pet_stdjoy[]; /* Referred to by joy_static_stddrv[] */ +extern void pet_ptvjoy_joy[]; +extern void pet_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ diff --git a/include/plus4.h b/include/plus4.h index 03f3a3784..3a764b984 100644 --- a/include/plus4.h +++ b/include/plus4.h @@ -58,8 +58,8 @@ /* The addresses of the static drivers */ -extern void plus4_stdjoy[]; /* Referred to by joy_static_stddrv[] */ -extern void plus4_stdser[]; +extern void plus4_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ +extern void plus4_stdser_ser[]; diff --git a/include/vic20.h b/include/vic20.h index 01a025bb0..378e32b4e 100644 --- a/include/vic20.h +++ b/include/vic20.h @@ -93,8 +93,8 @@ /* The addresses of the static drivers */ -extern void vic20_ptvjoy[]; -extern void vic20_stdjoy[]; /* Referred to by joy_static_stddrv[] */ +extern void vic20_ptvjoy_joy[]; +extern void vic20_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ -- 2.39.5