Tidy up the DISCARD hack

diff --git a/Kernel/cpu-z80/cpu.h b/Kernel/cpu-z80/cpu.h
index 183376a..6e1d0fd 100644 (file)
--- a/Kernel/cpu-z80/cpu.h
+++ b/Kernel/cpu-z80/cpu.h
@@ -58,4 +58,5 @@ typedef union {            /* this structure is endian dependent */
 #define cpu_to_le16(x) (x)
 #define le16_to_cpu(x) (x)
 
+#define DISCARDABLE    static void DISCARDSEG(void) __naked { __asm .area _DISCARD __endasm; }
 #endif

diff --git a/Kernel/dev/devsd.c b/Kernel/dev/devsd.c
index e8df58f..238c664 100644 (file)
--- a/Kernel/dev/devsd.c
+++ b/Kernel/dev/devsd.c
@@ -174,7 +174,8 @@ static int sd_send_command(uint8_t drive, unsigned char cmd, uint32_t arg)
 /* in the DISCARD segment. sdcc only allows us to specify one segment for   */
 /* each source file. This "solution" is a bit (well, very) hacky ...        */
 /****************************************************************************/
-static void DISCARDSEG(void) __naked { __asm .area _DISCARD __endasm; }
+
+DISCARDABLE
 
 void devsd_init(void)
 {