Implementa el protocolo ELP sobre UDP. Tiene problemas cuando los leds estan

[z.facultad/66.09/etherled.git] / pruebas / keil / red_test_anda / etherdev.c

diff --git a/pruebas/keil/red_test_anda/etherdev.c b/pruebas/keil/red_test_anda/etherdev.c
index d07bf9809f6652107e557840fa473a2baf009457..93abcbf4198b9e38999ad673d520a5094296c521 100644 (file)
--- a/pruebas/keil/red_test_anda/etherdev.c
+++ b/pruebas/keil/red_test_anda/etherdev.c
@@ -1,11 +1,17 @@
 // vim: set et sw=4 sts=4 :    
 
 // vim: set et sw=4 sts=4 :    
 

+#include "types.h"

 #include "etherdev.h"
 
 void sleep(unsigned char);
 
 #include "etherdev.h"
 
 void sleep(unsigned char);
 

-static xdata leds1 _at_ 0x0080;
-static xdata leds2 _at_ 0x00c0;
+#ifdef SDCC
+static xdata at 0x0080 byte leds1;
+static xdata at 0x00c0 byte leds2;
+#else
+static byte xdata leds1 _at_ 0x0080;
+static byte xdata leds2 _at_ 0x00c0;
+#endif

 
 unsigned char uip_buf[80] =
 {
 
 unsigned char uip_buf[80] =
 {


@@ -56,9 +62,6 @@ static void etherdev_reg_write(unsigned char reg, unsigned char wr_data)
     IOW = 1;
     NICE = 1;
 
     IOW = 1;
     NICE = 1;
 

-    // Set register data port as input again.
-    ETH_DATA_PORT = ETH_DATA_PORT_MASK;
-

     return;
 } 
 
     return;
 } 
 


@@ -71,6 +74,9 @@ static unsigned char etherdev_reg_read(unsigned char reg)
     ETH_ADDR_PORT &= ~ETH_ADDR_PORT_MASK;
     ETH_ADDR_PORT |= reg;
 
     ETH_ADDR_PORT &= ~ETH_ADDR_PORT_MASK;
     ETH_ADDR_PORT |= reg;
 

+    // Set register data port as input.
+    ETH_DATA_PORT = ETH_DATA_PORT_MASK;
+

     // Enable register data output from RTL8019AS.
     NICE = 0;
     IOR = 0;
     // Enable register data output from RTL8019AS.
     NICE = 0;
     IOR = 0;


@@ -94,7 +100,7 @@ static unsigned char etherdev_reg_read(unsigned char reg)
   Refer to National Semiconductor DP8390 App Note 874, July 1993.    
                                                                      
  */
   Refer to National Semiconductor DP8390 App Note 874, July 1993.    
                                                                      
  */

-bit etherdev_init(void)
+bool etherdev_init(void)

 {
     // Set IOR & IOW as they're active low.
     IOR = 1;
 {
     // Set IOR & IOW as they're active low.
     IOR = 1;


@@ -141,7 +147,7 @@ bit etherdev_init(void)
 
     // Mask all interrupts in mask register.
     etherdev_reg_write(IMR, 0x00);
 
     // Mask all interrupts in mask register.
     etherdev_reg_write(IMR, 0x00);

-
+    

     // Obtengo MAC de la placa
     etherdev_reg_write(RBCR0, 0x0c); // Vamos a leer 12 bytes (2 x 6)
     etherdev_reg_write(RBCR1, 0x00); 
     // Obtengo MAC de la placa
     etherdev_reg_write(RBCR0, 0x0c); // Vamos a leer 12 bytes (2 x 6)
     etherdev_reg_write(RBCR1, 0x00);