From fa6dae8fa96d4b94e3b9a6b3b41461837e072f7b Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Wed, 7 Nov 2012 23:20:58 +0000 Subject: [PATCH] Added declarations for target-specific static drivers being part of the C library. git-svn-id: svn://svn.cc65.org/cc65/trunk@5925 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- doc/funcref.sgml | 8 +------- include/apple2.h | 8 ++++++++ include/atari.h | 18 ++++++++++++++++++ include/atmos.h | 7 +++++++ include/c128.h | 21 ++++++++++++++++++--- include/c16.h | 7 +++++-- include/c64.h | 33 +++++++++++++++++++++++++++++---- include/cbm510.h | 13 +++++++++++++ include/cbm610.h | 12 ++++++++++++ include/lynx.h | 13 +++++++++++++ include/nes.h | 6 ++++++ include/pet.h | 15 ++++++++++++--- include/plus4.h | 7 +++++-- include/vic20.h | 7 +++++-- 14 files changed, 152 insertions(+), 23 deletions(-) diff --git a/doc/funcref.sgml b/doc/funcref.sgml index 55ec7d08b..05e2b66b8 100644 --- a/doc/funcref.sgml +++ b/doc/funcref.sgml @@ -5113,8 +5113,6 @@ be used in presence of a prototype. #include -extern void lynx_comlynx[]; - static void initialize(){ struct ser_params params = { SER_BAUD_9600, @@ -5179,9 +5177,7 @@ used in presence of a prototype. , -extern void lynx_comlynx[]; //Include the driver statically instead of loading it. - -ser_install(lynx_comlynx); +ser_install(lynx_comlynx); //Include the driver statically instead of loading it. @@ -5246,8 +5242,6 @@ be used in presence of a prototype. #include -extern void lynx_comlynx[]; - static void initialize(){ struct ser_params params = { SER_BAUD_9600, diff --git a/include/apple2.h b/include/apple2.h index b81e6bedd..89bee060a 100644 --- a/include/apple2.h +++ b/include/apple2.h @@ -141,6 +141,14 @@ extern unsigned char _dos_type; 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[]; + /*****************************************************************************/ diff --git a/include/atari.h b/include/atari.h index f22479095..c4c048f29 100644 --- a/include/atari.h +++ b/include/atari.h @@ -151,6 +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[]; /* provide old names for backwards compatibility */ #ifdef ATARI_COMPAT_PRE_2_11 diff --git a/include/atmos.h b/include/atmos.h index 90bc17f86..13427bd88 100644 --- a/include/atmos.h +++ b/include/atmos.h @@ -105,6 +105,13 @@ +/* The addresses of the static drivers */ +extern void atmos_pase[]; /* Referred to by joy_static_stddrv[] */ +extern void atmos_acia[]; +extern void atmos_240_200_2[]; /* Referred to by tgi_static_stddrv[] */ + + + void __fastcall__ atmos_load(const char* name); /* Load Atmos tape. */ diff --git a/include/c128.h b/include/c128.h index 973a04ceb..4d4cb9769 100644 --- a/include/c128.h +++ b/include/c128.h @@ -120,6 +120,24 @@ +/* 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[]; + + + unsigned __fastcall__ videomode (unsigned Mode); /* Set the video mode, return the old mode. Call with one of the VIDEOMODE_xx * constants. @@ -145,6 +163,3 @@ void slow (void); /* End of c128.h */ #endif - - - diff --git a/include/c16.h b/include/c16.h index eb33c8929..7124d51ae 100644 --- a/include/c16.h +++ b/include/c16.h @@ -53,8 +53,11 @@ -/* End of c16.h */ -#endif +/* The addresses of the static drivers */ +extern void c16_ram[]; +extern void c16_stdjoy[]; /* Referred to by joy_static_stddrv[] */ +/* End of c16.h */ +#endif diff --git a/include/c64.h b/include/c64.h index 655735618..f976fab8f 100644 --- a/include/c64.h +++ b/include/c64.h @@ -121,7 +121,35 @@ #define C64_EU_OLD 0x00 #define C64_DTV 0xFF /* C64 DTV */ - + + +/*****************************************************************************/ +/* Variables */ +/*****************************************************************************/ + + + +/* 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[] */ + + /*****************************************************************************/ /* Code */ @@ -136,6 +164,3 @@ unsigned char get_ostype (void); /* End of c64.h */ #endif - - - diff --git a/include/cbm510.h b/include/cbm510.h index 4efd78b06..1ced386b7 100644 --- a/include/cbm510.h +++ b/include/cbm510.h @@ -111,6 +111,19 @@ +/*****************************************************************************/ +/* Variables */ +/*****************************************************************************/ + + + +/* The addresses of the static drivers */ +extern void cbm510_ram[]; +extern void cbm510_stdjoy[]; /* Referred to by joy_static_stddrv[] */ +extern void cbm510_stdser[]; + + + /*****************************************************************************/ /* Code */ /*****************************************************************************/ diff --git a/include/cbm610.h b/include/cbm610.h index d52355209..aa401c205 100644 --- a/include/cbm610.h +++ b/include/cbm610.h @@ -96,6 +96,18 @@ +/*****************************************************************************/ +/* Variables */ +/*****************************************************************************/ + + + +/* The addresses of the static drivers */ +extern void cbm610_ram[]; +extern void cbm610_stdser[]; + + + /*****************************************************************************/ /* Code */ /*****************************************************************************/ diff --git a/include/lynx.h b/include/lynx.h index a99971cc4..e7f866fb4 100644 --- a/include/lynx.h +++ b/include/lynx.h @@ -92,6 +92,19 @@ +/*****************************************************************************/ +/* Variables */ +/*****************************************************************************/ + + + +/* 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[] */ + + + /*****************************************************************************/ /* Accessing the cart */ /*****************************************************************************/ diff --git a/include/nes.h b/include/nes.h index 5e1853b2b..464161093 100644 --- a/include/nes.h +++ b/include/nes.h @@ -92,6 +92,12 @@ +/* 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[] */ + + + void waitvblank (void); /* Wait for the vertical blanking */ diff --git a/include/pet.h b/include/pet.h index 66a3c752b..0b11efd43 100644 --- a/include/pet.h +++ b/include/pet.h @@ -73,6 +73,18 @@ +/*****************************************************************************/ +/* Variables */ +/*****************************************************************************/ + + + +/* The addresses of the static drivers */ +extern void pet_ptvjoy[]; +extern void pet_stdjoy[]; /* Referred to by joy_static_stddrv[] */ + + + /*****************************************************************************/ /* Code */ /*****************************************************************************/ @@ -91,6 +103,3 @@ /* End of pet.h */ #endif - - - diff --git a/include/plus4.h b/include/plus4.h index 0178d66af..03f3a3784 100644 --- a/include/plus4.h +++ b/include/plus4.h @@ -57,8 +57,11 @@ -/* End of plus4.h */ -#endif +/* The addresses of the static drivers */ +extern void plus4_stdjoy[]; /* Referred to by joy_static_stddrv[] */ +extern void plus4_stdser[]; +/* End of plus4.h */ +#endif diff --git a/include/vic20.h b/include/vic20.h index 904278b4f..01a025bb0 100644 --- a/include/vic20.h +++ b/include/vic20.h @@ -92,8 +92,11 @@ -/* End of vic20.h */ -#endif +/* The addresses of the static drivers */ +extern void vic20_ptvjoy[]; +extern void vic20_stdjoy[]; /* Referred to by joy_static_stddrv[] */ +/* End of vic20.h */ +#endif -- 2.39.5