Changeset 357b5f5 in mainline for uspace/srv/hw/netif/ne2000

Timestamp:

2011-01-23T20:09:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/srv/hw/netif/ne2000

Files:

• Makefile (moved) (moved from uspace/srv/hw/netif/dp8390/Makefile ) (1 diff)
• dp8390.c (added)
• dp8390.h (added)
• dp8390_drv.h (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390_drv.h )
• dp8390_port.h (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390_port.h )
• local.h (moved) (moved from uspace/srv/hw/netif/dp8390/local.h )
• ne2000.c (added)
• ne2000.h (moved) (moved from uspace/srv/hw/netif/dp8390/ne2000.h )

uspace/srv/hw/netif/ne2000/Makefile

@@ -39 +39 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        LIBS += $(USPACE_PREFIX)/srv/net/nil/eth/libeth.a
-endif
-
-BINARY = dp8390
+BINARY = ne2000
 
 SOURCES = \
         dp8390.c \
-        dp8390_module.c \
         ne2000.c