Jamify the new network cards drivers commited by Marcus.

Coming soon for ipro1000, too.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7396 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2004-05-03 23:25:31 +00:00
parent 6ba61f712f
commit 8f1b75b72e
6 changed files with 117 additions and 2 deletions
+4 -1
View File
@@ -1,6 +1,9 @@
SubDir OBOS_TOP src add-ons kernel drivers network ;
SubInclude OBOS_TOP src add-ons kernel drivers network stack ;
SubInclude OBOS_TOP src add-ons kernel drivers network rtl8139 ;
SubInclude OBOS_TOP src add-ons kernel drivers network sis900 ;
SubInclude OBOS_TOP src add-ons kernel drivers network wb840 ;
SubInclude OBOS_TOP src add-ons kernel drivers network stack ;
SubInclude OBOS_TOP src add-ons kernel drivers network via-rhine ;
SubInclude OBOS_TOP src add-ons kernel drivers network rtl8169 ;
# SubInclude OBOS_TOP src add-ons kernel drivers network ipro1000 ;
@@ -0,0 +1,49 @@
SubDir OBOS_TOP src add-ons kernel drivers network rtl8169 ;
# set some additional flags
SubDirCcFlags -Wall ;
# For ether_driver.h
UsePrivateHeaders net ;
R5KernelAddon rtl8169 : kernel drivers bin :
driver.c
device.c
util.c
;
# Package openbeos-rtl8169-cvs :
# rtl8169 :
# boot home config add-ons kernel drivers bin ;
# Package openbeos-rtl8169-cvs :
# <kernel!drivers!dev!net>rtl8169 :
# boot home config add-ons kernel drivers dev net ;
Package openbeos-networkingkit-cvs :
rtl8169 :
boot home config add-ons kernel drivers bin ;
Package openbeos-networkingkit-cvs :
<kernel!drivers!dev!net>rtl8169 :
boot home config add-ons kernel drivers dev net ;
# Link driver(s) to kernel/drivers/dev/net
{
local dir = [ FDirName $(OBOS_ADDON_DIR) kernel drivers dev net ] ;
local instDriver = <kernel!drivers!dev!net>rtl8169 ;
MakeLocate $(instDriver) : $(dir) ;
RelSymLink $(instDriver) : rtl8169 ;
}
# Installation
OBOSInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin :
rtl8169
;
OBOSInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net :
<installed>rtl8169 :
installed-symlink
;
@@ -1,6 +1,8 @@
SubDir OBOS_TOP src add-ons kernel drivers network stack ;
UsePrivateHeaders net ;
UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ;
UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ;
# a) Userland stack version:
@@ -15,9 +15,9 @@
#else
// Public includes
//#include <OS.h>
#include <drivers/Drivers.h>
#include <drivers/KernelExport.h>
#include <driver_settings.h>
// Posix includes
#include <malloc.h>
@@ -26,6 +26,7 @@
// Private includes
#include <net_stack_driver.h>
// #include <PPPControl.h> // for NET_STACK_CONTROL_NET_MODULE PPP support...
#include <userland_ipc.h>
#include <sys/sockio.h>
@@ -683,6 +684,10 @@ set_command_areas(net_command *command)
get_area_from_address(&command->area[4], args->u.sysctl.newp);
break;
case NET_STACK_CONTROL_NET_MODULE:
// TODO!
break;
case OSIOCGIFCONF:
case SIOCGIFCONF: {
struct ifconf *ifc = (void *) args;
@@ -0,0 +1,54 @@
SubDir OBOS_TOP src add-ons kernel drivers network via-rhine ;
# set some additional flags
SubDirCcFlags -Wall ;
# For ether_driver.h
UsePrivateHeaders net ;
R5KernelAddon via-rhine : kernel drivers bin :
entry.c
hook.c
cmd.c
mdio.c
pci.c
res.c
ring.c
util.c
;
# Package openbeos-via-rhine-cvs :
# via-rhine :
# boot home config add-ons kernel drivers bin ;
# Package openbeos-via-rhine-cvs :
# <kernel!drivers!dev!net>via-rhine :
# boot home config add-ons kernel drivers dev net ;
Package openbeos-networkingkit-cvs :
via-rhine :
boot home config add-ons kernel drivers bin ;
Package openbeos-networkingkit-cvs :
<kernel!drivers!dev!net>via-rhine :
boot home config add-ons kernel drivers dev net ;
# Link driver(s) to kernel/drivers/dev/net
{
local dir = [ FDirName $(OBOS_ADDON_DIR) kernel drivers dev net ] ;
local instDriver = <kernel!drivers!dev!net>via-rhine ;
MakeLocate $(instDriver) : $(dir) ;
RelSymLink $(instDriver) : via-rhine ;
}
# Installation
OBOSInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin :
via-rhine
;
OBOSInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net :
<installed>via-rhine :
installed-symlink
;
@@ -17,6 +17,8 @@ extern pci_info *gDevList[];
static int32 gOpenMask = 0;
extern void print_address(void *addr);
static status_t
wb840_open(const char *name, uint32 flags, void** cookie)
{