From 70ffab1812305611cd910031b9f7c446b1688940 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Sat, 21 Jul 2012 16:08:19 +0200 Subject: [PATCH] Updated check for SDCC compiler to support SDCC 3.2+ version. Actual SDCC version uses only underscore starting defines variants. Code was checked to build, but no attempt to run on target was proceed. Signed-off-by: Pavel Pisa --- arch/generic/defines/endian.h | 2 +- arch/generic/defines/lt_timer_types.h | 2 +- arch/mcs51/generic/defines/cpu_def.h | 2 +- arch/mcs51/generic/defines/types.h | 2 +- arch/mcs51/generic/libs/misc/vect.h | 2 +- arch/mcs51/generic/libs/misc/vect_a2c.c | 10 +++--- arch/mcs51/generic/libs/ulan/ul_drv_fnc.c | 22 ++++++------ arch/mcs51/generic/libs/ulan/ul_l_c2a.c | 36 +++++++++---------- arch/mcs51/generic/libs/ulan/ul_utsubst.h | 2 +- arch/mcs51/generic/libs/ulan/ulan.h | 2 +- arch/mcs51/mach-at89c51ed2/defines/mcu_regs.h | 2 +- arch/mcs51/mach-msc1210/defines/mcu_regs.h | 2 +- arch/mcs51/mach-msc1210/libs/flash/mcuflash.c | 12 +++---- arch/mcs51/mach-msc1210/libs/flash/mcuflash.h | 2 +- arch/mcs51/mach-msc1210/libs/msc_loader.c | 2 +- board/mcs51/hisc/system_def.h | 2 +- board/mcs51/ulad21/libs/bspbase/i2c.c | 2 +- board/mcs51/ulad21/system_def_msc51_uc1.h | 2 +- libs4c/usb/base/usb/usb.h | 2 +- libs4c/usb/pdiusb/pdiusb.c | 2 +- 20 files changed, 56 insertions(+), 56 deletions(-) diff --git a/arch/generic/defines/endian.h b/arch/generic/defines/endian.h index 13d6d51..aabadd9 100644 --- a/arch/generic/defines/endian.h +++ b/arch/generic/defines/endian.h @@ -5,7 +5,7 @@ #define __BIG_ENDIAN 4321 #define __PDP_ENDIAN 3412 -#if defined(__i386__) || defined(SDCC) || defined (__ARMEL__) +#if defined(__i386__) || defined(SDCC) || defined(__SDCC) || defined (__ARMEL__) #define __BYTE_ORDER __LITTLE_ENDIAN #endif diff --git a/arch/generic/defines/lt_timer_types.h b/arch/generic/defines/lt_timer_types.h index e7dc27c..92a7e18 100644 --- a/arch/generic/defines/lt_timer_types.h +++ b/arch/generic/defines/lt_timer_types.h @@ -3,7 +3,7 @@ //timers -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) typedef unsigned char lt_ticks_t; typedef char lt_tidiff_t; typedef unsigned int lt_mstime_t; diff --git a/arch/mcs51/generic/defines/cpu_def.h b/arch/mcs51/generic/defines/cpu_def.h index 0b005ea..a399c08 100644 --- a/arch/mcs51/generic/defines/cpu_def.h +++ b/arch/mcs51/generic/defines/cpu_def.h @@ -1,5 +1,5 @@ -#if defined(SDCC) // sdcc +#if defined(SDCC) || defined(__SDCC) // sdcc #ifndef NULL #define NULL 0x0000 #endif /*NULL*/ diff --git a/arch/mcs51/generic/defines/types.h b/arch/mcs51/generic/defines/types.h index 615e0f1..fdf1cf7 100644 --- a/arch/mcs51/generic/defines/types.h +++ b/arch/mcs51/generic/defines/types.h @@ -17,7 +17,7 @@ typedef unsigned char __u8; typedef __signed__ short __s16; typedef unsigned short __u16; -#if defined (__KEIL__) || (SDCC) || __INT_MAX__ == 32767 +#if defined (__KEIL__) || defined(SDCC) || defined(__SDCC) || __INT_MAX__ == 32767 typedef __signed__ long __s32; typedef unsigned long __u32; #else diff --git a/arch/mcs51/generic/libs/misc/vect.h b/arch/mcs51/generic/libs/misc/vect.h index 4aecc41..2f89dcf 100644 --- a/arch/mcs51/generic/libs/misc/vect.h +++ b/arch/mcs51/generic/libs/misc/vect.h @@ -5,7 +5,7 @@ /*extern "C" {*/ #endif -#if !defined(SDCC_MODEL_LARGE) || !defined(SDCC) +#if !defined(__SDCC_MODEL_LARGE) || !(defined(SDCC) || defined(__SDCC)) #define VECT_FNC_REENTRANT #else #define VECT_FNC_REENTRANT __reentrant diff --git a/arch/mcs51/generic/libs/misc/vect_a2c.c b/arch/mcs51/generic/libs/misc/vect_a2c.c index b32f49b..101f62f 100644 --- a/arch/mcs51/generic/libs/misc/vect_a2c.c +++ b/arch/mcs51/generic/libs/misc/vect_a2c.c @@ -1,13 +1,13 @@ #include "vect.h" -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE __data unsigned char vec_param1; #endif /* SDCC_MODEL_LARGE */ #endif /* SDCC */ -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE void __code *vec_set(prot_int fnc,unsigned char vec) VECT_FNC_REENTRANT { vec_param1=vec; @@ -57,7 +57,7 @@ void __code *vec_set(void __code *fnc,unsigned char vec) VECT_FNC_REENTRANT } #endif /* SDCC */ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) void vec_jmp(unsigned char vec) { __asm diff --git a/arch/mcs51/generic/libs/ulan/ul_drv_fnc.c b/arch/mcs51/generic/libs/ulan/ul_drv_fnc.c index 93085c7..29c4e18 100644 --- a/arch/mcs51/generic/libs/ulan/ul_drv_fnc.c +++ b/arch/mcs51/generic/libs/ulan/ul_drv_fnc.c @@ -1,13 +1,13 @@ #include #include "ul_drv_fnc.h" -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE __data uchar ul_dy_len; #endif /* SDCC_MODEL_LARGE */ #endif /* SDCC */ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) unsigned long ul_drv_get_sn() { __asm @@ -30,7 +30,7 @@ unsigned long ul_drv_get_sn() #error "unsuported compiler!" #endif -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) void ul_drv_set_sn(unsigned long sn) { __asm @@ -56,7 +56,7 @@ void ul_drv_set_sn(unsigned long sn) #endif -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) ul_idstr_t *ul_drv_get_idstr() { __asm @@ -68,7 +68,7 @@ ul_idstr_t *ul_drv_get_idstr() #error "unsuported compiler!" #endif -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) unsigned char ul_drv_get_adr() { __asm @@ -81,7 +81,7 @@ unsigned char ul_drv_get_adr() #error "unsuported compiler!" #endif -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) unsigned char ul_drv_get_dysa() { __asm @@ -94,7 +94,7 @@ unsigned char ul_drv_get_dysa() #error "unsuported compiler!" #endif -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) char ul_drv_rqa() UL_FNC_NAKED { __asm @@ -110,7 +110,7 @@ char ul_drv_rqa() UL_FNC_NAKED #error "unsuported compiler!" #endif -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) void ul_drv_clr_rq() { __asm @@ -123,8 +123,8 @@ void ul_drv_clr_rq() #error "unsuported compiler!" #endif -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE void ul_drv_set_status(uchar UL_ARGPTRTYPE *status,uchar len) { ul_dy_len=len; diff --git a/arch/mcs51/generic/libs/ulan/ul_l_c2a.c b/arch/mcs51/generic/libs/ulan/ul_l_c2a.c index 312a1e1..35747ca 100644 --- a/arch/mcs51/generic/libs/ulan/ul_l_c2a.c +++ b/arch/mcs51/generic/libs/ulan/ul_l_c2a.c @@ -42,8 +42,8 @@ #define KEIL_PTR_XDATA 0x01 #define KEIL_PTR_CODE 0x02 -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE __data int ul_c2a_len; #endif /* SDCC_MODEL_LARGE */ #endif /*SDCC*/ @@ -63,7 +63,7 @@ int ul_close(ul_fd_t ul_fd) return 0; } -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) ul_ssize_t __ul_read_avail() UL_FNC_NAKED { __asm @@ -94,8 +94,8 @@ ul_ssize_t __ul_read_avail(void) UL_FNC_NAKED #endif /* SDCC */ -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE /* ul_read function for small model */ ul_ssize_t __ul_read(void *buffer, ul_size_t size) UL_FNC_NAKED { @@ -239,8 +239,8 @@ __ul_read_l3: #pragma endasm #endif /* SDCC */ -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE /* ul_write function for small model */ ul_ssize_t __ul_write(const void *buffer, ul_size_t size) UL_FNC_NAKED { @@ -373,7 +373,7 @@ __ul_write_l1: #endif /* SDCC */ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) int __ul_newmsg(const ul_msginfo UL_ARGPTRTYPE *msginfo) UL_FNC_NAKED { /* Dadr R4, Com R5, Status R6, Stamp R7 */ @@ -442,7 +442,7 @@ __ul_newmsg_l1: #pragma endasm #endif /* SDCC */ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) int __ul_o_close() UL_FNC_NAKED { __asm @@ -479,7 +479,7 @@ __ul_o_close_l1: #pragma endasm #endif /* SDCC */ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) int __ul_i_close() UL_FNC_NAKED { __asm @@ -516,7 +516,7 @@ ___ul_i_close_l1: #pragma endasm #endif /* SDCC */ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) int __ul_tailmsg(const ul_msginfo UL_ARGPTRTYPE *msginfo) UL_FNC_NAKED { /* Dadr R4, Com R5, Status R6, Stamp R7 */ @@ -582,7 +582,7 @@ ___ul_tailmsg_l1: #pragma endasm #endif /* SDCC */ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) int __ul_freemsg() UL_FNC_NAKED { __asm @@ -622,7 +622,7 @@ ___ul_freemsg_l1: #pragma endasm #endif /* SDCC */ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) int __ul_acceptmsg(ul_msginfo UL_ARGPTRTYPE *msginfo) UL_FNC_NAKED { /* Dadr R4, Com R5, Status R6, Stamp R7 */ @@ -723,7 +723,7 @@ int __ul_addfilt(const ul_msginfo UL_ARGPTRTYPE *msginfo) return -1; } -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) int __ul_abortmsg() { __asm @@ -747,7 +747,7 @@ ___ul_abortmsg: #pragma endasm #endif /* SDCC */ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) uchar __ul_inepoll() UL_FNC_NAKED { __asm @@ -779,7 +779,7 @@ ___ul_inepoll_l1: #pragma endasm #endif /*SDCC*/ -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) char ul_drv_init() { __asm @@ -805,7 +805,7 @@ ul_drv_init: #pragma endasm #endif -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) char ul_drv_set_adr(uchar addr) { __asm @@ -831,7 +831,7 @@ _ul_drv_set_adr: #pragma endasm #endif -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) char ul_drv_set_bdiv(uchar addr) { __asm diff --git a/arch/mcs51/generic/libs/ulan/ul_utsubst.h b/arch/mcs51/generic/libs/ulan/ul_utsubst.h index 8e245c2..facaa7b 100644 --- a/arch/mcs51/generic/libs/ulan/ul_utsubst.h +++ b/arch/mcs51/generic/libs/ulan/ul_utsubst.h @@ -65,7 +65,7 @@ #endif /* !__GNUC__ */ #ifndef UL_ATTR_REENTRANT -#ifndef SDCC +#if !defined(SDCC) && !defined(__SDCC) #define UL_ATTR_REENTRANT #else #define UL_ATTR_REENTRANT __reentrant diff --git a/arch/mcs51/generic/libs/ulan/ulan.h b/arch/mcs51/generic/libs/ulan/ulan.h index 68af658..d5ae967 100644 --- a/arch/mcs51/generic/libs/ulan/ulan.h +++ b/arch/mcs51/generic/libs/ulan/ulan.h @@ -37,7 +37,7 @@ typedef struct ul_idstr_t { #define UL_FNC_NAKED #endif /*UL_WITH_NAKED*/ -#if !defined(SDCC_MODEL_LARGE) || !defined(SDCC) +#if !defined(__SDCC_MODEL_LARGE) || !(defined(SDCC) || defined(__SDCC)) #define UL_FNC_REENTRANT #else #define UL_FNC_REENTRANT __reentrant diff --git a/arch/mcs51/mach-at89c51ed2/defines/mcu_regs.h b/arch/mcs51/mach-at89c51ed2/defines/mcu_regs.h index 175517a..3fb84b5 100644 --- a/arch/mcs51/mach-at89c51ed2/defines/mcu_regs.h +++ b/arch/mcs51/mach-at89c51ed2/defines/mcu_regs.h @@ -7,7 +7,7 @@ // Keyval #define KVPB_CHUNK_SIZE 1 -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) #include __sfr __at (0xD1) FCON ; __sfr __at (0x8F) CKCON0 ; diff --git a/arch/mcs51/mach-msc1210/defines/mcu_regs.h b/arch/mcs51/mach-msc1210/defines/mcu_regs.h index ae66236..92870c4 100644 --- a/arch/mcs51/mach-msc1210/defines/mcu_regs.h +++ b/arch/mcs51/mach-msc1210/defines/mcu_regs.h @@ -7,7 +7,7 @@ // Keyval #define KVPB_CHUNK_SIZE 1 -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) #include "reg1210.hsd" #else #ifdef __KEIL__ diff --git a/arch/mcs51/mach-msc1210/libs/flash/mcuflash.c b/arch/mcs51/mach-msc1210/libs/flash/mcuflash.c index b0ac7ed..545fb10 100644 --- a/arch/mcs51/mach-msc1210/libs/flash/mcuflash.c +++ b/arch/mcs51/mach-msc1210/libs/flash/mcuflash.c @@ -1,16 +1,16 @@ #include "mcuflash.h" #include "mcu_regs.h" -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE __data char mscflash_fdata; __data char mscflash_fdm; #endif /* SDCC_MODEL_LARGE */ #endif /*SDCC*/ __bit ea,eai; -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE char __page_erase (int faddr, char fdata, char fdm) { mscflash_fdata=fdata; @@ -68,8 +68,8 @@ char __page_erase (int faddr, char fdata, char fdm) #endif /* SDCC */ -#ifdef SDCC -#ifndef SDCC_MODEL_LARGE +#if defined(SDCC) || defined(__SDCC) +#ifndef __SDCC_MODEL_LARGE char __write_flash_chk (int faddr, char fdata, char fdm) { mscflash_fdata=fdata; diff --git a/arch/mcs51/mach-msc1210/libs/flash/mcuflash.h b/arch/mcs51/mach-msc1210/libs/flash/mcuflash.h index 7b126df..5b82e83 100644 --- a/arch/mcs51/mach-msc1210/libs/flash/mcuflash.h +++ b/arch/mcs51/mach-msc1210/libs/flash/mcuflash.h @@ -7,7 +7,7 @@ #include -#if !defined(SDCC_MODEL_LARGE) || !defined(SDCC) +#if !defined(__SDCC_MODEL_LARGE) || !(defined(SDCC) || defined(__SDCC)) #define MSC_FNC_REENTRANT #else #define MSC_FNC_REENTRANT __reentrant diff --git a/arch/mcs51/mach-msc1210/libs/msc_loader.c b/arch/mcs51/mach-msc1210/libs/msc_loader.c index ea80623..d9a4164 100644 --- a/arch/mcs51/mach-msc1210/libs/msc_loader.c +++ b/arch/mcs51/mach-msc1210/libs/msc_loader.c @@ -36,7 +36,7 @@ int msc1210_mass_erase(unsigned mode, unsigned addr) } -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) void msc1210_goto( unsigned addr) { _asm diff --git a/board/mcs51/hisc/system_def.h b/board/mcs51/hisc/system_def.h index 023e36d..1e2a069 100644 --- a/board/mcs51/hisc/system_def.h +++ b/board/mcs51/hisc/system_def.h @@ -28,7 +28,7 @@ (0x100-((CPU_SYS_HZ/12/x) % 256)) -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) __sbit __at (0xB2) LED_GP; // P3.2 __sbit __at (0xB2) LED_ERR; // P3.2 __sbit __at (0xB6) CS_WR; // P3.6 diff --git a/board/mcs51/ulad21/libs/bspbase/i2c.c b/board/mcs51/ulad21/libs/bspbase/i2c.c index 75874da..30d5e70 100644 --- a/board/mcs51/ulad21/libs/bspbase/i2c.c +++ b/board/mcs51/ulad21/libs/bspbase/i2c.c @@ -17,7 +17,7 @@ void i2c_wait(void) { _nop_(); _nop_(); _nop_(); - #elif SDCC + #elif defined(SDCC) || defined(__SDCC) __asm nop; nop; diff --git a/board/mcs51/ulad21/system_def_msc51_uc1.h b/board/mcs51/ulad21/system_def_msc51_uc1.h index 12ab992..e5c6ef6 100644 --- a/board/mcs51/ulad21/system_def_msc51_uc1.h +++ b/board/mcs51/ulad21/system_def_msc51_uc1.h @@ -38,7 +38,7 @@ #define PDIUSB_WRITE_DATA_ADDR (0x34) #define PDIUSB_COMMAND_ADDR (0x36) -#ifdef SDCC +#if defined(SDCC) || defined(__SDCC) __sbit __at 0xB4 SCL; // P3.4 __sbit __at 0x90 SDAI; // P1.0 __sbit __at 0x91 SDAO; // P1.1 diff --git a/libs4c/usb/base/usb/usb.h b/libs4c/usb/base/usb/usb.h index a81c8c2..5ab5df9 100644 --- a/libs4c/usb/base/usb/usb.h +++ b/libs4c/usb/base/usb/usb.h @@ -11,7 +11,7 @@ #include "usb_spec.h" #include "usb_devdes.h" -#if defined(SDCC) || defined(__KEIL__) || defined(__C51__) +#if defined(SDCC) || defined(__SDCC) || defined(__KEIL__) || defined(__C51__) /*8051 special handling*/ #define REENTRANT_SIGN __reentrant #else diff --git a/libs4c/usb/pdiusb/pdiusb.c b/libs4c/usb/pdiusb/pdiusb.c index 280717c..ffeabc6 100644 --- a/libs4c/usb/pdiusb/pdiusb.c +++ b/libs4c/usb/pdiusb/pdiusb.c @@ -23,7 +23,7 @@ #endif #endif - #ifndef SDCC + #if !defined(SDCC) && !defined(__SDCC) #define xdata #endif -- 2.39.2