Updated check for SDCC compiler to support SDCC 3.2+ version.

[sysless.git] / arch / mcs51 / generic / libs / ulan / ul_l_c2a.c

diff --git a/arch/mcs51/generic/libs/ulan/ul_l_c2a.c b/arch/mcs51/generic/libs/ulan/ul_l_c2a.c
index 2387063830a93a5bea4251b32c25ff1a0daacefc..35747cac0928e52134dbe0a58f83570f2233d28a 100644 (file)
--- a/arch/mcs51/generic/libs/ulan/ul_l_c2a.c
+++ b/arch/mcs51/generic/libs/ulan/ul_l_c2a.c
@@ -42,15 +42,15 @@
 #define KEIL_PTR_XDATA 0x01
 #define KEIL_PTR_CODE 0x02
 
-#ifdef SDCC
-#ifndef SDCC_MODEL_LARGE
-data int ul_c2a_len;
+#if defined(SDCC) || defined(__SDCC)
+#ifndef __SDCC_MODEL_LARGE
+__data int ul_c2a_len;
 #endif /* SDCC_MODEL_LARGE */
 #endif /*SDCC*/
 
 #ifndef UL_WITH_HANDLE
 ul_fd_t        ul_fd;
-ul_msginfo xdata msginfo;
+ul_msginfo __xdata msginfo;
 #endif
 
 ul_fd_t        ul_open(const char *dev_name, const char *options)
@@ -63,10 +63,10 @@ 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
+  __asm
        .globl ul_i_l
        clr  f0
        lcall ul_i_l
@@ -75,7 +75,7 @@ ul_ssize_t __ul_read_avail() UL_FNC_NAKED
     #ifdef UL_WITH_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
-  _endasm;
+  __endasm;
 }
 #else /* SDCC */
 
@@ -94,13 +94,13 @@ 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
 {
   ul_c2a_len=size;
-  _asm
+  __asm
        .globl ul_rd
        mov  r4,_ul_c2a_len
        mov  r5,_ul_c2a_len+1
@@ -135,16 +135,16 @@ ul_ssize_t __ul_read(void *buffer, ul_size_t size) UL_FNC_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
 00005$:
-  _endasm;
+  __endasm;
 }
 #else /* SDCC_MODEL_LARGE */
 /* For large model
  * size   Allocated to stack - offset -4  (the push _bp taken into account)
  * buffer Allocated to registers 
  */
-ul_ssize_t __ul_read(void *buffer, ul_size_t size) reentrant UL_FNC_NAKED 
+ul_ssize_t __ul_read(void *buffer, ul_size_t size) __reentrant UL_FNC_NAKED 
 {
-  _asm
+  __asm
        .globl ul_rd
        mov  a,sp
        clr  f0
@@ -192,7 +192,7 @@ ul_ssize_t __ul_read(void *buffer, ul_size_t size) reentrant UL_FNC_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
 00005$:
-  _endasm;
+  __endasm;
 }
 #endif /* SDCC_MODEL_LARGE */
 #else /* SDCC */
@@ -239,13 +239,13 @@ __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
 {
   ul_c2a_len=size;
-  _asm
+  __asm
        .globl ul_wr
        .globl ul_wrc
        .globl ul_wri
@@ -276,16 +276,16 @@ ul_ssize_t __ul_write(const void *buffer, ul_size_t size) UL_FNC_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
 00005$:
-  _endasm;
+  __endasm;
 }
 #else /* SDCC_MODEL_LARGE */
 /* For large model
  * size   Allocated to stack - offset -4 (the push _bp taken into account)
  * buffer Allocated to registers
  */
-ul_ssize_t __ul_write(const void *buffer, ul_size_t size) reentrant UL_FNC_NAKED
+ul_ssize_t __ul_write(const void *buffer, ul_size_t size) __reentrant UL_FNC_NAKED
 {
-  _asm
+  __asm
        .globl ul_wr
        .globl ul_wrc
        .globl ul_wri
@@ -329,7 +329,7 @@ ul_ssize_t __ul_write(const void *buffer, ul_size_t size) reentrant UL_FNC_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
 00005$:
-  _endasm;
+  __endasm;
 }
 #endif /* SDCC_MODEL_LARGE */
 #else /* SDCC */
@@ -373,11 +373,11 @@ __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 */
-  _asm
+  __asm
        .globl ul_o_op
        .globl ul_o_new
        movx a,@dptr    /* dadr */
@@ -403,7 +403,7 @@ int __ul_newmsg(const ul_msginfo UL_ARGPTRTYPE  *msginfo) UL_FNC_NAKED
     #ifdef UL_WITH_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
-  _endasm;
+  __endasm;
 }
 #else /* SDCC */
 #pragma asm
@@ -442,10 +442,10 @@ __ul_newmsg_l1:
 #pragma endasm
 #endif /* SDCC */
 
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 int    __ul_o_close() UL_FNC_NAKED
 {
-  _asm
+  __asm
        .globl ul_o_cl
        clr  f0
        lcall ul_o_cl
@@ -456,7 +456,7 @@ int __ul_o_close() UL_FNC_NAKED
     #ifdef UL_WITH_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
-  _endasm;
+  __endasm;
 }
 #else /* SDCC */
 #pragma asm
@@ -479,10 +479,10 @@ __ul_o_close_l1:
 #pragma endasm
 #endif /* SDCC */
 
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 int    __ul_i_close() UL_FNC_NAKED
 {
-  _asm
+  __asm
        .globl ul_i_cl
        clr  f0
        lcall ul_i_cl
@@ -493,7 +493,7 @@ int __ul_i_close() UL_FNC_NAKED
     #ifdef UL_WITH_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
-  _endasm;
+  __endasm;
 }
 #else /* SDCC */
 #pragma asm
@@ -516,11 +516,11 @@ ___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 */
-  _asm
+  __asm
        .globl ul_o_op
        clr  f0
        lcall ul_o_cl   /* close previous output message */
@@ -546,7 +546,7 @@ int __ul_tailmsg(const ul_msginfo UL_ARGPTRTYPE  *msginfo) UL_FNC_NAKED
     #ifdef UL_WITH_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
-  _endasm;
+  __endasm;
 }
 #else /* SDCC */
 #pragma asm
@@ -582,10 +582,10 @@ ___ul_tailmsg_l1:
 #pragma endasm
 #endif /* SDCC */
 
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 int    __ul_freemsg() UL_FNC_NAKED
 {
-  _asm
+  __asm
        .globl ul_o_op
        clr f0
        lcall ul_i_cl   /* close previous input message */
@@ -598,7 +598,7 @@ int __ul_freemsg() UL_FNC_NAKED
     #ifdef UL_WITH_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
-  _endasm;
+  __endasm;
 }
 #else /* SDCC */
 #pragma asm
@@ -622,11 +622,11 @@ ___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 */
-  _asm
+  __asm
        .globl ul_i_op
        .globl ul_i_l
        clr  f0
@@ -665,7 +665,7 @@ int __ul_acceptmsg(ul_msginfo UL_ARGPTRTYPE  *msginfo) UL_FNC_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
 00030$:
-  _endasm;
+  __endasm;
 }
 #else /* SDCC */
 #pragma asm
@@ -723,14 +723,14 @@ int __ul_addfilt(const ul_msginfo UL_ARGPTRTYPE  *msginfo)
   return -1;
 }
 
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 int __ul_abortmsg()
 {
-  _asm
+  __asm
        .globl ul_o_abrt
        lcall ul_i_cl
        lcall ul_o_abrt
-  _endasm;
+  __endasm;
   return 0;
 }
 #else /* SDCC */
@@ -747,10 +747,10 @@ ___ul_abortmsg:
 #pragma endasm
 #endif /* SDCC */
 
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 uchar __ul_inepoll() UL_FNC_NAKED
 {
-  _asm
+  __asm
        .globl ul_i_ne
        lcall ul_i_ne
        mov  dptr,#0
@@ -760,7 +760,7 @@ uchar __ul_inepoll() UL_FNC_NAKED
     #ifdef UL_WITH_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
-  _endasm;
+  __endasm;
 }
 #else /*SDCC*/
 #pragma asm
@@ -779,15 +779,15 @@ ___ul_inepoll_l1:
 #pragma endasm
 #endif /*SDCC*/
 
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 char ul_drv_init()
 {
-  _asm
+  __asm
        .globl ul_init
        mov  r0,#0
        mov  r2,#0
        lcall ul_fnc    /* Init */
-  _endasm;
+  __endasm;
   return 0;
 }
 #else /*SDCC*/
@@ -805,15 +805,15 @@ ul_drv_init:
 #pragma endasm
 #endif
 
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 char ul_drv_set_adr(uchar addr)
 {
-  _asm
+  __asm
        .globl ul_fnc
        mov  r0,#2
        mov  a,dpl
        lcall ul_fnc    /* Address */
-  _endasm;
+  __endasm;
   return 0;
 }
 #else /*SDCC*/
@@ -831,15 +831,15 @@ _ul_drv_set_adr:
 #pragma endasm
 #endif
 
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 char ul_drv_set_bdiv(uchar addr)
 {
-  _asm
+  __asm
        .globl ul_fnc
        mov  r0,#1      /* 2 => 19200 Bd for 11059 kHz */
        mov  a,dpl      /* 5 => 19200 Bd for 18432 kHz */
        lcall ul_fnc    /* Baudrate */
-  _endasm;
+  __endasm;
   return 0;
 }
 #else /*SDCC*/
@@ -922,7 +922,7 @@ int ul_fd_wait(ul_fd_t ul_fd, int wait_sec)
 #if 0
 int test_fnc(int i)
 {
-  _asm
+  __asm
        mov  a,#0xaa
        mov  b,#0xbb
        mov  r0,#0xc0
@@ -937,6 +937,6 @@ int test_fnc(int i)
     #ifdef UL_WITH_NAKED
        ret
     #endif /*UL_WITH_NAKED*/
-  _endasm;
+  __endasm;
 }
 #endif