diff --git a/src/sys/include/isa/ne2k.h b/src/sys/include/isa/ne2k.h index 83901bf..ddf1dea 100644 --- a/src/sys/include/isa/ne2k.h +++ b/src/sys/include/isa/ne2k.h @@ -25,7 +25,7 @@ #define _NE2K_H #include -#include +#include #define ether_addr ether_addr_t typedef struct dp_rcvhdr diff --git a/src/sys/include/sys/device.old.h b/src/sys/include/sys/device.old.h new file mode 100644 index 0000000..ecd8cb2 --- /dev/null +++ b/src/sys/include/sys/device.old.h @@ -0,0 +1,58 @@ +/************************************************************************************** + Copyright (c) 2002 The UbixOS Project + All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors +in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project nor the names of its +contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + $Id$ + +**************************************************************************************/ + +#ifndef _DEVICE_H +#define _DEVICE_H + +#include + +struct device { + struct net *net; + uInt16 ioAddr; + uInt32 irq; + struct ei_device *priv; + uInt32 mtu; + }; + +struct net { + char mac[6]; + char broadcast[6]; + }; + +struct ei_device { + int txStartPage; + int rxStartPage; + int stopPage; + int currentPage; + uInt16 word16; + uInt32 pingPong; + int tx1; + int tx2; + }; + +#endif + +/*** + END + ***/ + diff --git a/src/sys/isa/ne2k.c b/src/sys/isa/ne2k.c index 4d85bf5..b08252e 100644 --- a/src/sys/isa/ne2k.c +++ b/src/sys/isa/ne2k.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.3 2004/04/20 00:53:16 reddawg + Works + Revision 1.2 2004/04/19 21:32:14 reddawg Fixes: @@ -46,7 +49,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/sys/net/netif/ethernetif.c b/src/sys/net/netif/ethernetif.c index 28ec25c..85258f4 100644 --- a/src/sys/net/netif/ethernetif.c +++ b/src/sys/net/netif/ethernetif.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include diff --git a/src/sys/pci/hd.c b/src/sys/pci/hd.c index 2cdd6de..807400b 100644 --- a/src/sys/pci/hd.c +++ b/src/sys/pci/hd.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.2 2004/04/26 22:22:33 reddawg + DevFS now uses correct size of device + Revision 1.1.1.1 2004/04/15 12:07:16 reddawg UbixOS v1.0 @@ -64,7 +67,11 @@ hdd3->hdDev = 0x50; if (!initDrive(hdd0)) { addDrive(1,1,hdd0,hdRead,hdWrite,0x0,hdd0->hdSize*512); - devFsMkNod("ad0",'b',0x1,0x0); + devFsMkNod("ad0",'c',0x1,0x0); + devFsMkNod("ad0s1",'c',0x1,0x1); + devFsMkNod("ad0s2",'c',0x1,0x2); + devFsMkNod("ad0s3",'c',0x1,0x3); + devFsMkNod("ad0s4",'c',0x1,0x4); } /* if (!initDrive(hdd1)) {