From 3485434ce71270bf894f1a5f30a0ffaa45c9b3a6 Mon Sep 17 00:00:00 2001 From: MaartenBrock Date: Sat, 2 Dec 2006 11:53:42 +0000 Subject: [PATCH] * device/include/asm/default/features.h, * device/include/asm/ds390/features.h, * device/include/mcs51/at89s53.h, * device/include/ser.h, * device/include/ser_ir.h, * device/include/serial.h: changed keywords to double underscore variants, fixes bug 1590261 some more, thanks Steven Borley git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4498 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 10 ++++++++++ device/include/asm/default/features.h | 4 ++-- device/include/asm/ds390/features.h | 16 ++++++++-------- device/include/mcs51/at89s53.h | 12 ++++++------ device/include/ser.h | 2 +- device/include/ser_ir.h | 12 ++++++------ device/include/serial.h | 6 +++--- 7 files changed, 36 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00688395..cd2c8207 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-12-02 Maarten Brock + + * device/include/asm/default/features.h, + * device/include/asm/ds390/features.h, + * device/include/mcs51/at89s53.h, + * device/include/ser.h, + * device/include/ser_ir.h, + * device/include/serial.h: changed keywords to double underscore variants, + fixes bug 1590261 some more, thanks Steven Borley + 2006-12-01 Raphael Neider * src/pic/pcode.c (register_reassign): do not crash on recursive code diff --git a/device/include/asm/default/features.h b/device/include/asm/default/features.h index 7695c7b4..6e02808c 100644 --- a/device/include/asm/default/features.h +++ b/device/include/asm/default/features.h @@ -3,8 +3,8 @@ #ifndef __SDC51_ASM_FEATURES_H #define __SDC51_ASM_FEATURES_H 1 -#define _REENTRANT reentrant -#define _CODE code +#define _REENTRANT __reentrant +#define _CODE __code #define _AUTOMEM #define _STATMEM diff --git a/device/include/asm/ds390/features.h b/device/include/asm/ds390/features.h index cc3e5db4..2d84124b 100644 --- a/device/include/asm/ds390/features.h +++ b/device/include/asm/ds390/features.h @@ -3,8 +3,8 @@ #ifndef __SDC51_ASM_DS390_FEATURES_H #define __SDC51_ASM_DS390_FEATURES_H 1 -#define _REENTRANT reentrant -#define _CODE code +#define _REENTRANT __reentrant +#define _CODE __code /* define _AUTOMEM to indicate the default storage class for automatic variables. To be used with pointers to automatic variables. @@ -18,14 +18,14 @@ */ #if defined(SDCC_STACK_AUTO) #if defined(SDCC_USE_XSTACK) - #define _AUTOMEM pdata + #define _AUTOMEM __pdata #else - #define _AUTOMEM idata + #define _AUTOMEM __idata #endif #elif defined(SDCC_MODEL_SMALL) - #define _AUTOMEM data + #define _AUTOMEM __data #else - #define _AUTOMEM xdata + #define _AUTOMEM __xdata #endif /* define _STATMEM to indicate the default storage class for @@ -38,9 +38,9 @@ } */ #if defined(SDCC_MODEL_SMALL) - #define _STATMEM data + #define _STATMEM __data #else - #define _STATMEM xdata + #define _STATMEM __xdata #endif #endif diff --git a/device/include/mcs51/at89s53.h b/device/include/mcs51/at89s53.h index 57f015b2..0cffd2c0 100644 --- a/device/include/mcs51/at89s53.h +++ b/device/include/mcs51/at89s53.h @@ -32,12 +32,12 @@ #endif /* define AT89S53 specific registers only */ -sfr at 0x84 DP1L; /* Data Pointer 1 Low Byte */ -sfr at 0x85 DP1H ; /* Data Pointer 1 High Byte */ -sfr at 0x86 SPDR; /* SPI Data Register */ -sfr at 0xAA SPSR; /* SPI Status Register */ -sfr at 0x96 WMCON; /* Watchdog and Memory Control Register */ -sfr at 0xD5 SPCR; /* SPI Control Register */ +__sfr __at (0x84) DP1L; /* Data Pointer 1 Low Byte */ +__sfr __at (0x85) DP1H; /* Data Pointer 1 High Byte */ +__sfr __at (0x86) SPDR; /* SPI Data Register */ +__sfr __at (0xAA) SPSR; /* SPI Status Register */ +__sfr __at (0x96) WMCON; /* Watchdog and Memory Control Register */ +__sfr __at (0xD5) SPCR; /* SPI Control Register */ /*------------------------------------------------ SPSR (0xAA) Bit Values - Reset Value = 0000.0000 diff --git a/device/include/ser.h b/device/include/ser.h index ca001e1d..17035b40 100644 --- a/device/include/ser.h +++ b/device/include/ser.h @@ -25,7 +25,7 @@ #define _SER_H_ void ser_init(void); -void ser_interrupt_handler(void) interrupt 4 using 1; +void ser_interrupt_handler(void) __interrupt 4 __using 1; void ser_putc(unsigned char); unsigned char ser_getc(void); void ser_printString(char *String); diff --git a/device/include/ser_ir.h b/device/include/ser_ir.h index 55c70a7a..97b79df2 100644 --- a/device/include/ser_ir.h +++ b/device/include/ser_ir.h @@ -1,22 +1,22 @@ /*------------------------------------------------------------------------- - ser_ir.h - header file for serial routines - + ser_ir.h - header file for serial routines + Written By - Josef Wolf (1999) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - + In other words, you are welcome to use, share and improve this program. You are forbidden to forbid anyone else to use, share and improve what you give them. Help stamp out software-hoarding! @@ -38,4 +38,4 @@ unsigned char ser_can_rcv (void); unsigned char ser_can_xmt (void); /* needs to be defined somewhere :-() */ -void ser_handler (void) interrupt 4; +void ser_handler (void) __interrupt 4; diff --git a/device/include/serial.h b/device/include/serial.h index a5cca406..527c41ed 100644 --- a/device/include/serial.h +++ b/device/include/serial.h @@ -1,15 +1,15 @@ //---------------------------------------------------------------------------- //Written by Dmitry S. Obukhov, 1996 -// dso@usa.net +// dso@usa.net //---------------------------------------------------------------------------- //This module implements serial interrupt handler and IO routinwes using -//two 256 byte cyclic buffers. Bit variables can be used as flags for +//two 256 byte cyclic buffers. Bit variables can be used as flags for //real-time kernel tasks //Last modified 6 Apr 97 //---------------------------------------------------------------------------- void serial_init(void); -void serial_interrupt_handler(void) interrupt 4 using 1; +void serial_interrupt_handler(void) __interrupt 4 __using 1; void serial_putc(unsigned char); unsigned char serial_getc(void); void autobaud(); -- 2.30.2