commit 03ad6a4e2295c7864f24cabb2e1bbaf8bcf52a27
author oliverschmidt <oliverschmidt> ven. mai 13 00:01:56 2005 +0000
committer oliverschmidt <oliverschmidt> ven. mai 13 00:01:56 2005 +0000
tree ede02e31ab8a09e9b01fbb4d0512dea4d6b5cc8a
parent d50119457f87f7359614a49b8b2ace138a9ea38a

Made packet drivers not set the LSB (least significant byte) of the MAC address as it is now set by the config app.

contiki-apple2/uip/lancegs-drv.c

diff --git a/contiki-apple2/uip/lancegs-drv.c b/contiki-apple2/uip/lancegs-drv.c
index a39aae3..e25c2d0 100644
--- a/contiki-apple2/uip/lancegs-drv.c
+++ b/contiki-apple2/uip/lancegs-drv.c
@@ -28,10 +28,12 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: lancegs-drv.c,v 1.2 2005/03/17 21:51:45 oliverschmidt Exp $
+ * $Id: lancegs-drv.c,v 1.3 2005/05/13 00:01:56 oliverschmidt Exp $
  *
  */
 
+#include <string.h>
+
 #include "packet-service.h"
 
 #include "lan91c96.h"
@@ -40,9 +42,9 @@
 
 static void output(u8_t *hdr, u16_t hdrlen, u8_t *data, u16_t datalen);
 
-/* 00:80:0F is the OUI of Standard Microsystems, A2:A2:A2 just means Apple2 */
+/* 00:80:0F is the OUI of Standard Microsystems, A2:A2 just means Apple2 */
 static const struct uip_eth_addr addr =
-  {{0x00,0x80,0x0f,0xa2,0xa2,0xa2}};
+  {{0x00,0x80,0x0f,0xa2,0xa2,0x00}};
 
 static const struct packet_service_state state =
   {
@@ -74,7 +76,8 @@
   switch(ev) {
   case EK_EVENT_INIT:
   case EK_EVENT_REPLACE:
-    uip_setethaddr(addr);
+    /* Don't overwrite LSB */
+    memcpy(&uip_ethaddr, &addr, 5);
     lan91c96_init();
     break;
   case EK_EVENT_REQUEST_REPLACE:

contiki-apple2/uip/uther-drv.c

diff --git a/contiki-apple2/uip/uther-drv.c b/contiki-apple2/uip/uther-drv.c
index 7020abe..d05e8b5 100644
--- a/contiki-apple2/uip/uther-drv.c
+++ b/contiki-apple2/uip/uther-drv.c
@@ -28,10 +28,12 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uther-drv.c,v 1.1 2005/03/13 22:19:21 oliverschmidt Exp $
+ * $Id: uther-drv.c,v 1.2 2005/05/13 00:01:56 oliverschmidt Exp $
  *
  */
 
+#include <string.h>
+
 #include "packet-service.h"
 
 #include "cs8900a.h"
@@ -40,9 +42,9 @@
 
 static void output(u8_t *hdr, u16_t hdrlen, u8_t *data, u16_t datalen);
 
-/* 00:0E:3A is the OUI of Cirrus Logic, A2:A2:A2 just means Apple2 */
+/* 00:0E:3A is the OUI of Cirrus Logic, A2:A2 just means Apple2 */
 static const struct uip_eth_addr addr =
-  {{0x00,0x0e,0x3a,0xa2,0xa2,0xa2}};
+  {{0x00,0x0e,0x3a,0xa2,0xa2,0x00}};
 
 static const struct packet_service_state state =
   {
@@ -74,7 +76,8 @@
   switch(ev) {
   case EK_EVENT_INIT:
   case EK_EVENT_REPLACE:
-    uip_setethaddr(addr);
+    /* Don't overwrite LSB */
+    memcpy(&uip_ethaddr, &addr, 5);
     cs8900a_init();
     break;
   case EK_EVENT_REQUEST_REPLACE: