From 2e8a65bda43bba9022adf1b73d004c7623ed4e0a Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Tue, 28 May 2013 21:20:37 +0200 Subject: [PATCH] Renamed Atari drivers. As a preparation for the introduction of the 'atarixl' target it is necessary that all drivers have a base name... - no longer than 7 characters - with a common prefix --- include/atari.h | 34 +++++++++++------------ libsrc/atari/emd/{atr130xe.s => atr130.s} | 0 libsrc/atari/joy/{atarimj8.s => atrmj8.s} | 0 libsrc/atari/joy/{ataristd.s => atrstd.s} | 0 libsrc/atari/joy_stat_stddrv.s | 4 +-- libsrc/atari/joy_stddrv.s | 2 +- libsrc/atari/tgi/{atari10.s => atr10.s} | 0 libsrc/atari/tgi/{atari11.s => atr11.s} | 0 libsrc/atari/tgi/{atari14.s => atr14.s} | 0 libsrc/atari/tgi/{atari15.s => atr15.s} | 0 libsrc/atari/tgi/{atari3.s => atr3.s} | 0 libsrc/atari/tgi/{atari4.s => atr4.s} | 0 libsrc/atari/tgi/{atari5.s => atr5.s} | 0 libsrc/atari/tgi/{atari6.s => atr6.s} | 0 libsrc/atari/tgi/{atari7.s => atr7.s} | 0 libsrc/atari/tgi/{atari8.s => atr8.s} | 0 libsrc/atari/tgi/{atari9.s => atr9.s} | 0 libsrc/atari/tgi_stat_stddrv.s | 4 +-- libsrc/atari/tgi_stddrv.s | 2 +- 19 files changed, 23 insertions(+), 23 deletions(-) rename libsrc/atari/emd/{atr130xe.s => atr130.s} (100%) rename libsrc/atari/joy/{atarimj8.s => atrmj8.s} (100%) rename libsrc/atari/joy/{ataristd.s => atrstd.s} (100%) rename libsrc/atari/tgi/{atari10.s => atr10.s} (100%) rename libsrc/atari/tgi/{atari11.s => atr11.s} (100%) rename libsrc/atari/tgi/{atari14.s => atr14.s} (100%) rename libsrc/atari/tgi/{atari15.s => atr15.s} (100%) rename libsrc/atari/tgi/{atari3.s => atr3.s} (100%) rename libsrc/atari/tgi/{atari4.s => atr4.s} (100%) rename libsrc/atari/tgi/{atari5.s => atr5.s} (100%) rename libsrc/atari/tgi/{atari6.s => atr6.s} (100%) rename libsrc/atari/tgi/{atari7.s => atr7.s} (100%) rename libsrc/atari/tgi/{atari8.s => atr8.s} (100%) rename libsrc/atari/tgi/{atari9.s => atr9.s} (100%) diff --git a/include/atari.h b/include/atari.h index 26c555cc4..b6714e715 100644 --- a/include/atari.h +++ b/include/atari.h @@ -150,25 +150,25 @@ extern void _rest_vecs(void); /* restore system vectors */ extern char *_getdefdev(void); /* get default floppy device */ /* global variables */ -extern unsigned char _dos_type; /* the DOS flavour */ -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 unsigned char _dos_type; /* the DOS flavour */ +extern void atr130_emd[]; +extern void atrstd_joy[]; /* referred to by joy_static_stddrv[] */ +extern void atrm8_joy[]; +extern void atr3_tgi[]; +extern void atr4_tgi[]; +extern void atr5_tgi[]; +extern void atr6_tgi[]; +extern void atr7_tgi[]; +extern void atr8_tgi[]; /* referred to by tgi_static_stddrv[] */ extern void atr8p2_tgi[]; -extern void atari9_tgi[]; +extern void atr9_tgi[]; extern void atr9p2_tgi[]; +extern void atr10_tgi[]; +extern void atr10p2_tgi[]; +extern void atr11_tgi[]; +extern void atr14_tgi[]; +extern void atr15_tgi[]; +extern void atr15p2_tgi[]; /* provide old names for backwards compatibility */ #ifdef ATARI_COMPAT_PRE_2_11 diff --git a/libsrc/atari/emd/atr130xe.s b/libsrc/atari/emd/atr130.s similarity index 100% rename from libsrc/atari/emd/atr130xe.s rename to libsrc/atari/emd/atr130.s diff --git a/libsrc/atari/joy/atarimj8.s b/libsrc/atari/joy/atrmj8.s similarity index 100% rename from libsrc/atari/joy/atarimj8.s rename to libsrc/atari/joy/atrmj8.s diff --git a/libsrc/atari/joy/ataristd.s b/libsrc/atari/joy/atrstd.s similarity index 100% rename from libsrc/atari/joy/ataristd.s rename to libsrc/atari/joy/atrstd.s diff --git a/libsrc/atari/joy_stat_stddrv.s b/libsrc/atari/joy_stat_stddrv.s index dffe40ebf..cbaf344d0 100644 --- a/libsrc/atari/joy_stat_stddrv.s +++ b/libsrc/atari/joy_stat_stddrv.s @@ -7,8 +7,8 @@ ; .export _joy_static_stddrv - .import _ataristd_joy + .import _atrstd_joy .rodata -_joy_static_stddrv := _ataristd_joy +_joy_static_stddrv := _atrstd_joy diff --git a/libsrc/atari/joy_stddrv.s b/libsrc/atari/joy_stddrv.s index aec33bf57..f3ab74e7b 100644 --- a/libsrc/atari/joy_stddrv.s +++ b/libsrc/atari/joy_stddrv.s @@ -10,4 +10,4 @@ .rodata -_joy_stddrv: .asciiz "ataristd.joy" +_joy_stddrv: .asciiz "atrstd.joy" diff --git a/libsrc/atari/tgi/atari10.s b/libsrc/atari/tgi/atr10.s similarity index 100% rename from libsrc/atari/tgi/atari10.s rename to libsrc/atari/tgi/atr10.s diff --git a/libsrc/atari/tgi/atari11.s b/libsrc/atari/tgi/atr11.s similarity index 100% rename from libsrc/atari/tgi/atari11.s rename to libsrc/atari/tgi/atr11.s diff --git a/libsrc/atari/tgi/atari14.s b/libsrc/atari/tgi/atr14.s similarity index 100% rename from libsrc/atari/tgi/atari14.s rename to libsrc/atari/tgi/atr14.s diff --git a/libsrc/atari/tgi/atari15.s b/libsrc/atari/tgi/atr15.s similarity index 100% rename from libsrc/atari/tgi/atari15.s rename to libsrc/atari/tgi/atr15.s diff --git a/libsrc/atari/tgi/atari3.s b/libsrc/atari/tgi/atr3.s similarity index 100% rename from libsrc/atari/tgi/atari3.s rename to libsrc/atari/tgi/atr3.s diff --git a/libsrc/atari/tgi/atari4.s b/libsrc/atari/tgi/atr4.s similarity index 100% rename from libsrc/atari/tgi/atari4.s rename to libsrc/atari/tgi/atr4.s diff --git a/libsrc/atari/tgi/atari5.s b/libsrc/atari/tgi/atr5.s similarity index 100% rename from libsrc/atari/tgi/atari5.s rename to libsrc/atari/tgi/atr5.s diff --git a/libsrc/atari/tgi/atari6.s b/libsrc/atari/tgi/atr6.s similarity index 100% rename from libsrc/atari/tgi/atari6.s rename to libsrc/atari/tgi/atr6.s diff --git a/libsrc/atari/tgi/atari7.s b/libsrc/atari/tgi/atr7.s similarity index 100% rename from libsrc/atari/tgi/atari7.s rename to libsrc/atari/tgi/atr7.s diff --git a/libsrc/atari/tgi/atari8.s b/libsrc/atari/tgi/atr8.s similarity index 100% rename from libsrc/atari/tgi/atari8.s rename to libsrc/atari/tgi/atr8.s diff --git a/libsrc/atari/tgi/atari9.s b/libsrc/atari/tgi/atr9.s similarity index 100% rename from libsrc/atari/tgi/atari9.s rename to libsrc/atari/tgi/atr9.s diff --git a/libsrc/atari/tgi_stat_stddrv.s b/libsrc/atari/tgi_stat_stddrv.s index 05c570d7a..5f1be70f8 100644 --- a/libsrc/atari/tgi_stat_stddrv.s +++ b/libsrc/atari/tgi_stat_stddrv.s @@ -7,8 +7,8 @@ ; .export _tgi_static_stddrv - .import _atari8_tgi + .import _atr8_tgi .rodata -_tgi_static_stddrv := _atari8_tgi +_tgi_static_stddrv := _atr8_tgi diff --git a/libsrc/atari/tgi_stddrv.s b/libsrc/atari/tgi_stddrv.s index 94ced91d4..bec030511 100644 --- a/libsrc/atari/tgi_stddrv.s +++ b/libsrc/atari/tgi_stddrv.s @@ -10,4 +10,4 @@ .rodata -_tgi_stddrv: .asciiz "atari8.tgi" +_tgi_stddrv: .asciiz "atr8.tgi" -- 2.39.5