Adjusted C declarations to the changed static driver names.

diff --git a/include/apple2.h b/include/apple2.h
index 89bee060ac5a514b186d9d969916cec3863f39c9..f5dcff0aee175afdc42c86a3e8b9e238bcf7cb76 100644 (file)
--- 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 297039d181fb893dafc2369ae1feb88016b8df9d..11252211772988fa551620feeca8a9740022ad50 100644 (file)
--- 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 c4c048f2930955f67e254ed462dcc8dd14bed53c..555dc9a936fd17e2a2cfd467553b9f939634b92f 100644 (file)
--- 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 66245227d989c32638eef745f9e0dd7e84c43a4e..e4c2af9b26b42d892c278bf9863aed69327dcd11 100644 (file)
--- 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 4d4cb9769c50a65fdad1bd318b7430efd61325db..26fb2527435b8325d116481f519d7c1c25f43cfd 100644 (file)
--- 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 7124d51ae39bc3a3dd8da44f7941d15889e90ddf..35124a709fd4526cf6e7b39ae0c0d33a774e7ec9 100644 (file)
--- 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 f976fab8f682cf419530bfed5f973220f1ce4239..5cc2bd08e24d31fb0155dd22573884fbc5170b6f 100644 (file)
--- 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 1ced386b71b499ec8378574331e1009c732927b6..19370d8185dd9f29479dab9c5f567145092647e5 100644 (file)
--- 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 aa401c205e121f53ae52fab93bb55def2e9689fc..523b49577d8f71e852846edcb9a1ad836015843e 100644 (file)
--- 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 632e32f1e75100dde8673e91f1f161173eea646d..ec1a8c4646c5f5442c8cc4cc1a5f51b3f7142753 100644 (file)
--- 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 4641610937c4066ed5dce29ba8fbde90207fe3fc..46219b3de063697c52341db1b26b56dfbe283594 100644 (file)
--- 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 0b11efd435088899e61b932ea7719d31f0ba0697..24e937c5a66309d9640fa6952a69a14efe62e60d 100644 (file)
--- 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 03f3a3784da06e3e09684e06867e13335e26785c..3a764b984ab64e963208de59d8bb055394933c04 100644 (file)
--- 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 01a025bb0a0b59c111de15b9117eb4c0d3c80d4e..378e32b4e614459c41ae52d75ef9a6296b7d81d0 100644 (file)
--- 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[] */