* as/link/lkar.h: sgetl and sputl are independent of endianness

[fw/sdcc] / device / lib / _ser.c

diff --git a/device/lib/_ser.c b/device/lib/_ser.c
index 7a9504ca83a19d2365a1b2b99b0c335b194f79cc..69d1833014975eba3827ea916448f3f7cebe8912 100644 (file)
--- a/device/lib/_ser.c
+++ b/device/lib/_ser.c
@@ -29,21 +29,21 @@
 /*      $Id$    */
 
 
-#include <reg51.h>
+#include <8052.h>
 
 #include "ser.h"
 
 #define NON_BLOCKING
 
-unsigned char xdata ser_txIndexIn;
-unsigned char xdata ser_txIndexOut;
-unsigned char xdata ser_rxIndexIn;
-unsigned char xdata ser_rxIndexOut;
+unsigned char __xdata ser_txIndexIn;
+unsigned char __xdata ser_txIndexOut;
+unsigned char __xdata ser_rxIndexIn;
+unsigned char __xdata ser_rxIndexOut;
 
-unsigned char xdata ser_txBuffer[0x100];
-unsigned char xdata ser_rxBuffer[0x100];
+unsigned char __xdata ser_txBuffer[0x100];
+unsigned char __xdata ser_rxBuffer[0x100];
 
-static bit ser_txBusy;
+static __bit ser_txBusy;
 
 void
 ser_init(void)
@@ -79,10 +79,15 @@ ser_init(void)
 }
 
 void
-ser_interrupt_handler(void) interrupt 4 using 1
+ser_interrupt_handler(void) __interrupt 4 __using 1
 {
   ES=0;
 
+  if (RI) {
+    RI = 0;
+    ser_rxBuffer[ser_rxIndexIn++] = SBUF;
+  }
+
   if (TI) {
     TI = 0;
     if (ser_txIndexIn == ser_txIndexOut) {
@@ -93,11 +98,6 @@ ser_interrupt_handler(void) interrupt 4 using 1
     }
   }
 
-  if (RI) {
-    RI = 0;
-    ser_rxBuffer[ser_rxIndexIn++] = SBUF;
-  }
-
   ES=1;
 }
 
@@ -142,10 +142,10 @@ ser_printString(char *String)
   }
 }
 
-short
+char
 ser_charAvail(void)
 {
-  short ret = 0;
+  char ret = 0;
 
   if (ser_rxIndexIn != ser_rxIndexOut) {
     ret = 1;