From: ol.sc Date: Thu, 1 Nov 2012 19:53:47 +0000 (+0000) Subject: Introduced static standard drivers. X-Git-Tag: V2.14~183 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6860ac7dfda72169a918e6508c3ecd6fd02e5934;p=cc65 Introduced static standard drivers. git-svn-id: svn://svn.cc65.org/cc65/trunk@5891 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/include/joystick.h b/include/joystick.h index f93e7c027..063278124 100644 --- a/include/joystick.h +++ b/include/joystick.h @@ -77,6 +77,9 @@ extern const unsigned char joy_masks[8]; /* The name of the standard joystick driver for a platform */ extern const char joy_stddrv[]; +/* The address of the static standard joystick driver for a platform */ +extern const char joy_static_stddrv[]; + /*****************************************************************************/ diff --git a/include/mouse.h b/include/mouse.h index 27577d193..a085baf92 100644 --- a/include/mouse.h +++ b/include/mouse.h @@ -107,6 +107,9 @@ extern const struct mouse_callbacks mouse_def_callbacks; /* The name of the standard mouse driver for a platform */ extern const char mouse_stddrv[]; +/* The address of the static standard mouse driver for a platform */ +extern const char mouse_static_stddrv[]; + /*****************************************************************************/ diff --git a/include/tgi.h b/include/tgi.h index d16c30c0b..2cbea5bd0 100644 --- a/include/tgi.h +++ b/include/tgi.h @@ -61,6 +61,9 @@ /* The name of the standard tgi driver for a platform */ extern const char tgi_stddrv[]; +/* The address of the static standard tgi driver for a platform */ +extern const void tgi_static_stddrv[]; + /* A vector font definition */ typedef struct tgi_vectorfont tgi_vectorfont; diff --git a/libsrc/apple2/Makefile b/libsrc/apple2/Makefile index 0e90ff521..ab6e5c658 100644 --- a/libsrc/apple2/Makefile +++ b/libsrc/apple2/Makefile @@ -105,11 +105,13 @@ S_OBJS= _scrsize.o \ initcwd.o \ iobuf.o \ isdevice.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ mainargs.o \ mcbdefault.o \ mli.o \ + mouse_stat_stddrv.o \ mouse_stddrv.o \ open.o \ oserrlist.o \ @@ -128,6 +130,7 @@ S_OBJS= _scrsize.o \ systime.o \ sysuname.o \ tgi_colors.o \ + tgi_stat_stddrv.o \ tgi_stddrv.o \ toascii.o \ vtabz.o \ diff --git a/libsrc/apple2/joy_stat_stddrv.s b/libsrc/apple2/joy_stat_stddrv.s new file mode 100644 index 000000000..d6b416e0f --- /dev/null +++ b/libsrc/apple2/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _apple2_stdjoy + +.rodata + +_joy_static_stddrv := _apple2_stdjoy diff --git a/libsrc/apple2/mouse_stat_stddrv.s b/libsrc/apple2/mouse_stat_stddrv.s new file mode 100644 index 000000000..86884d8b8 --- /dev/null +++ b/libsrc/apple2/mouse_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard mouse driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void mouse_static_stddrv[]; +; + + .export _mouse_static_stddrv + .import _apple2_stdmou + +.rodata + +_mouse_static_stddrv := _apple2_stdmou diff --git a/libsrc/apple2/tgi_stat_stddrv.s b/libsrc/apple2/tgi_stat_stddrv.s new file mode 100644 index 000000000..ea887a59e --- /dev/null +++ b/libsrc/apple2/tgi_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard tgi driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void tgi_static_stddrv[]; +; + + .export _tgi_static_stddrv + .import _apple2_280_192_8 + +.rodata + +_tgi_static_stddrv := _apple2_280_192_8 diff --git a/libsrc/apple2enh/Makefile b/libsrc/apple2enh/Makefile index 7d6e38a1f..4b1d8814d 100644 --- a/libsrc/apple2enh/Makefile +++ b/libsrc/apple2enh/Makefile @@ -108,11 +108,13 @@ S_OBJS= _scrsize.o \ initcwd.o \ iobuf.o \ isdevice.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ mainargs.o \ mcbdefault.o \ mli.o \ + mouse_stat_stddrv.o \ mouse_stddrv.o \ open.o \ oserrlist.o \ @@ -132,6 +134,7 @@ S_OBJS= _scrsize.o \ sysuname.o \ textframe.o \ tgi_colors.o \ + tgi_stat_stddrv.o \ tgi_stddrv.o \ toascii.o \ videomode.o \ diff --git a/libsrc/atari/Makefile b/libsrc/atari/Makefile index bc94b5006..514e0df84 100644 --- a/libsrc/atari/Makefile +++ b/libsrc/atari/Makefile @@ -103,6 +103,7 @@ OBJS = _scrsize.o \ graphics.o \ initcwd.o \ inviocb.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ lseek.o \ @@ -127,6 +128,7 @@ OBJS = _scrsize.o \ systime.o \ sysuname.o \ tgi_colors.o \ + tgi_stat_stddrv.o \ tgi_stddrv.o \ toascii.o \ tvtype.o \ diff --git a/libsrc/atari/joy_stat_stddrv.s b/libsrc/atari/joy_stat_stddrv.s new file mode 100644 index 000000000..f51950477 --- /dev/null +++ b/libsrc/atari/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _atari_stdjoy + +.rodata + +_joy_static_stddrv := _atari_stdjoy diff --git a/libsrc/atari/tgi_stat_stddrv.s b/libsrc/atari/tgi_stat_stddrv.s new file mode 100644 index 000000000..fb328f02f --- /dev/null +++ b/libsrc/atari/tgi_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard tgi driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void tgi_static_stddrv[]; +; + + .export _tgi_static_stddrv + .import _atari_8 + +.rodata + +_tgi_static_stddrv := _atari_8 diff --git a/libsrc/atmos/Makefile b/libsrc/atmos/Makefile index c9d2e76f6..c69b04d33 100644 --- a/libsrc/atmos/Makefile +++ b/libsrc/atmos/Makefile @@ -81,6 +81,7 @@ OBJS = _scrsize.o \ gotox.o \ gotoxy.o \ gotoy.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ mainargs.o \ @@ -91,6 +92,7 @@ OBJS = _scrsize.o \ systime.o \ sysuname.o \ tgi_colors.o \ + tgi_stat_stddrv.o \ tgi_stddrv.o \ wherex.o \ wherey.o \ diff --git a/libsrc/atmos/joy_stat_stddrv.s b/libsrc/atmos/joy_stat_stddrv.s new file mode 100644 index 000000000..fd0f7e1f6 --- /dev/null +++ b/libsrc/atmos/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _atmos_pase + +.rodata + +_joy_static_stddrv := _atmos_pase diff --git a/libsrc/atmos/tgi_stat_stddrv.s b/libsrc/atmos/tgi_stat_stddrv.s new file mode 100644 index 000000000..892b14dd6 --- /dev/null +++ b/libsrc/atmos/tgi_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard tgi driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void tgi_static_stddrv[]; +; + + .export _tgi_static_stddrv + .import _atmos_240_200_2 + +.rodata + +_tgi_static_stddrv := _atmos_240_200_2 diff --git a/libsrc/c128/Makefile b/libsrc/c128/Makefile index e371fe326..3d698de78 100644 --- a/libsrc/c128/Makefile +++ b/libsrc/c128/Makefile @@ -77,11 +77,13 @@ OBJS = _scrsize.o \ devnum.o \ fast.o \ get_tv.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ kernal.o \ mainargs.o \ mcbdefault.o \ + mouse_stat_stddrv.o \ mouse_stddrv.o \ randomize.o \ revers.o \ @@ -90,6 +92,7 @@ OBJS = _scrsize.o \ systime.o \ sysuname.o \ tgi_colors.o \ + tgi_stat_stddrv.o \ tgi_stddrv.o \ toggle_videomode.o \ videomode.o \ diff --git a/libsrc/c128/joy_stat_stddrv.s b/libsrc/c128/joy_stat_stddrv.s new file mode 100644 index 000000000..72a6117fe --- /dev/null +++ b/libsrc/c128/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _c128_stdjoy + +.rodata + +_joy_static_stddrv := _c128_stdjoy diff --git a/libsrc/c128/mouse_stat_stddrv.s b/libsrc/c128/mouse_stat_stddrv.s new file mode 100644 index 000000000..f1c79e01e --- /dev/null +++ b/libsrc/c128/mouse_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard mouse driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void mouse_static_stddrv[]; +; + + .export _mouse_static_stddrv + .import _c128_1351 + +.rodata + +_mouse_static_stddrv := _c128_1351 diff --git a/libsrc/c128/tgi_stat_stddrv.s b/libsrc/c128/tgi_stat_stddrv.s new file mode 100644 index 000000000..a26bc68dd --- /dev/null +++ b/libsrc/c128/tgi_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard tgi driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void tgi_static_stddrv[]; +; + + .export _tgi_static_stddrv + .import _c128_640_200_2 + +.rodata + +_tgi_static_stddrv := _c128_640_200_2 diff --git a/libsrc/c16/Makefile b/libsrc/c16/Makefile index 9f4455add..24f8acb44 100644 --- a/libsrc/c16/Makefile +++ b/libsrc/c16/Makefile @@ -68,6 +68,7 @@ OBJS = _scrsize.o \ crt0.o \ devnum.o \ get_tv.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ kclose.o \ diff --git a/libsrc/c16/joy_stat_stddrv.s b/libsrc/c16/joy_stat_stddrv.s new file mode 100644 index 000000000..d7b9fb89d --- /dev/null +++ b/libsrc/c16/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _c16_stdjoy + +.rodata + +_joy_static_stddrv := _c16_stdjoy diff --git a/libsrc/c64/Makefile b/libsrc/c64/Makefile index 67486d2f9..5443a63e7 100644 --- a/libsrc/c64/Makefile +++ b/libsrc/c64/Makefile @@ -76,12 +76,14 @@ OBJS = _scrsize.o \ devnum.o \ get_ostype.o \ get_tv.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ kernal.o \ kplot.o \ mainargs.o \ mcbdefault.o \ + mouse_stat_stddrv.o \ mouse_stddrv.o \ randomize.o \ revers.o \ @@ -89,6 +91,7 @@ OBJS = _scrsize.o \ systime.o \ sysuname.o \ tgi_colors.o \ + tgi_stat_stddrv.o \ tgi_stddrv.o \ $(EMDS:.emd=-emd.o) \ $(JOYS:.joy=-joy.o) \ diff --git a/libsrc/c64/joy_stat_stddrv.s b/libsrc/c64/joy_stat_stddrv.s new file mode 100644 index 000000000..c56de745c --- /dev/null +++ b/libsrc/c64/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _c64_stdjoy + +.rodata + +_joy_static_stddrv := _c64_stdjoy diff --git a/libsrc/c64/mouse_stat_stddrv.s b/libsrc/c64/mouse_stat_stddrv.s new file mode 100644 index 000000000..eb1d3729e --- /dev/null +++ b/libsrc/c64/mouse_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard mouse driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void mouse_static_stddrv[]; +; + + .export _mouse_static_stddrv + .import _c64_1351 + +.rodata + +_mouse_static_stddrv := _c64_1351 diff --git a/libsrc/c64/tgi_stat_stddrv.s b/libsrc/c64/tgi_stat_stddrv.s new file mode 100644 index 000000000..cf52829cf --- /dev/null +++ b/libsrc/c64/tgi_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard tgi driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void tgi_static_stddrv[]; +; + + .export _tgi_static_stddrv + .import _c64_320_200_2 + +.rodata + +_tgi_static_stddrv := _c64_320_200_2 diff --git a/libsrc/cbm510/Makefile b/libsrc/cbm510/Makefile index 2c497322e..ee6344eee 100644 --- a/libsrc/cbm510/Makefile +++ b/libsrc/cbm510/Makefile @@ -68,6 +68,7 @@ OBJS = _scrsize.o \ crt0.o \ devnum.o \ extzp.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ kclose.o \ diff --git a/libsrc/cbm510/joy_stat_stddrv.s b/libsrc/cbm510/joy_stat_stddrv.s new file mode 100644 index 000000000..5001cb434 --- /dev/null +++ b/libsrc/cbm510/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _cbm510_stdjoy + +.rodata + +_joy_static_stddrv := _cbm510_stdjoy diff --git a/libsrc/lynx/Makefile b/libsrc/lynx/Makefile index 96ec92c04..e429b64c9 100644 --- a/libsrc/lynx/Makefile +++ b/libsrc/lynx/Makefile @@ -79,6 +79,7 @@ OBJS = bllhdr.o \ exec.o \ exehdr.o \ extzp.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ load.o \ @@ -90,6 +91,7 @@ OBJS = bllhdr.o \ read.o \ sysuname.o \ tgi_colors.o \ + tgi_stat_stddrv.o \ tgi_stddrv.o \ toascii.o \ uploader.o \ diff --git a/libsrc/lynx/joy_stat_stddrv.s b/libsrc/lynx/joy_stat_stddrv.s new file mode 100644 index 000000000..618ab2b0a --- /dev/null +++ b/libsrc/lynx/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _lynx_stdjoy + +.rodata + +_joy_static_stddrv := _lynx_stdjoy diff --git a/libsrc/lynx/tgi_stat_stddrv.s b/libsrc/lynx/tgi_stat_stddrv.s new file mode 100644 index 000000000..74b160424 --- /dev/null +++ b/libsrc/lynx/tgi_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard tgi driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void tgi_static_stddrv[]; +; + + .export _tgi_static_stddrv + .import _lynx_160_102_16 + +.rodata + +_tgi_static_stddrv := _lynx_160_102_16 diff --git a/libsrc/nes/Makefile b/libsrc/nes/Makefile index d1e2350fe..78f48cac9 100644 --- a/libsrc/nes/Makefile +++ b/libsrc/nes/Makefile @@ -79,6 +79,7 @@ OBJS = _scrsize.o \ gotox.o \ gotoxy.o \ gotoy.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ mainargs.o \ ppu.o \ @@ -88,6 +89,7 @@ OBJS = _scrsize.o \ setcursor.o \ sysuname.o \ tgi_colors.o \ + tgi_stat_stddrv.o \ tgi_stddrv.o \ waitvblank.o \ wherex.o \ diff --git a/libsrc/nes/joy_stat_stddrv.s b/libsrc/nes/joy_stat_stddrv.s new file mode 100644 index 000000000..476e34207 --- /dev/null +++ b/libsrc/nes/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _nes_stdjoy + +.rodata + +_joy_static_stddrv := _nes_stdjoy diff --git a/libsrc/nes/tgi_stat_stddrv.s b/libsrc/nes/tgi_stat_stddrv.s new file mode 100644 index 000000000..7982ec6f9 --- /dev/null +++ b/libsrc/nes/tgi_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard tgi driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void tgi_static_stddrv[]; +; + + .export _tgi_static_stddrv + .import _nes_64_56_2 + +.rodata + +_tgi_static_stddrv := _nes_64_56_2 diff --git a/libsrc/pet/Makefile b/libsrc/pet/Makefile index 7835b1fec..23f589242 100644 --- a/libsrc/pet/Makefile +++ b/libsrc/pet/Makefile @@ -62,6 +62,7 @@ OBJS = _scrsize.o \ crt0.o \ devnum.o \ get_tv.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ kbsout.o \ diff --git a/libsrc/pet/joy_stat_stddrv.s b/libsrc/pet/joy_stat_stddrv.s new file mode 100644 index 000000000..f9b57adc5 --- /dev/null +++ b/libsrc/pet/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _pet_stdjoy + +.rodata + +_joy_static_stddrv := _pet_stdjoy diff --git a/libsrc/plus4/Makefile b/libsrc/plus4/Makefile index ba8f1a80b..838c67a58 100644 --- a/libsrc/plus4/Makefile +++ b/libsrc/plus4/Makefile @@ -68,6 +68,7 @@ OBJS = _scrsize.o \ crt0.o \ devnum.o \ get_tv.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kacptr.o \ kbasin.o \ diff --git a/libsrc/plus4/joy_stat_stddrv.s b/libsrc/plus4/joy_stat_stddrv.s new file mode 100644 index 000000000..f2c31f9aa --- /dev/null +++ b/libsrc/plus4/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _plus4_stdjoy + +.rodata + +_joy_static_stddrv := _plus4_stdjoy diff --git a/libsrc/vic20/Makefile b/libsrc/vic20/Makefile index 0d6d75070..14a45709d 100644 --- a/libsrc/vic20/Makefile +++ b/libsrc/vic20/Makefile @@ -61,6 +61,7 @@ OBJS = _scrsize.o \ cputc.o \ devnum.o \ get_tv.o \ + joy_stat_stddrv.o \ joy_stddrv.o \ kbhit.o \ kernal.o \ diff --git a/libsrc/vic20/joy_stat_stddrv.s b/libsrc/vic20/joy_stat_stddrv.s new file mode 100644 index 000000000..31fb62f0a --- /dev/null +++ b/libsrc/vic20/joy_stat_stddrv.s @@ -0,0 +1,14 @@ +; +; Address of the static standard joystick driver +; +; Oliver Schmidt, 2012-11-01 +; +; const void joy_static_stddrv[]; +; + + .export _joy_static_stddrv + .import _vic20_stdjoy + +.rodata + +_joy_static_stddrv := _vic20_stdjoy