Index: uspace/srv/hw/netif/dp8390/dp8390.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.c (revision 47651528be973886a1e7115cb558c2ab50e711c0) +++ uspace/srv/hw/netif/dp8390/dp8390.c (revision 8f5e252705d5ca6f72f60a2ba9d6bbf42b7f7f17) @@ -1,28 +1,2 @@ -/* - * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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 and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * * Any deviations from these conditions require written permission from the copyright holder in advance - * - * - * Disclaimer - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, 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 HOLDER OR ANY AUTHORS 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. - * - * Changes: - * 2009 ported to HelenOS, Lukas Mejdrech - */ - /** @addtogroup dp8390 * @{ @@ -43,16 +17,4 @@ #include "dp8390_drv.h" #include "dp8390_port.h" - -/* - * dp8390.c - * - * Created: before Dec 28, 1992 by Philip Homburg - * - * Modified Mar 10 1994 by Philip Homburg - * Become a generic dp8390 driver. - * - * Modified Dec 20 1996 by G. Falzoni - * Added support for 3c503 boards. - */ #include "local.h" @@ -81,40 +43,4 @@ static void outsw(port_t port, void * buf, size_t size); -//static u16_t eth_ign_proto; -//static char *progname; - -/* Configuration */ -/*typedef struct dp_conf -{ - port_t dpc_port; - int dpc_irq; - phys_bytes dpc_mem; - char *dpc_envvar; -} dp_conf_t; -*/ -//dp_conf_t dp_conf[]= /* Card addresses */ -//{ - /* I/O port, IRQ, Buffer address, Env. var. */ -/* { 0x280, 3, 0xD0000, "DPETH0" }, - { 0x300, 5, 0xC8000, "DPETH1" }, - { 0x380, 10, 0xD8000, "DPETH2" }, -}; -*/ -/* Test if dp_conf has exactly DE_PORT_NR entries. If not then you will see - * the error: "array size is negative". - */ -//extern int ___dummy[DE_PORT_NR == sizeof(dp_conf)/sizeof(dp_conf[0]) ? 1 : -1]; - -/* Card inits configured out? */ -#if !ENABLE_WDETH -#define wdeth_probe(dep) (0) -#endif -#if !ENABLE_NE2000 -#define ne_probe(dep) (0) -#endif -#if !ENABLE_3C503 -#define el2_probe(dep) (0) -#endif - /* Some clones of the dp8390 and the PC emulator 'Bochs' require the CR_STA * on writes to the CR register. Additional CR_STAs do not appear to hurt @@ -123,28 +49,9 @@ #define CR_EXTRA CR_STA -//#if ENABLE_PCI -//_PROTOTYPE(static void pci_conf, (void) ); -//#endif -//_PROTOTYPE(static void do_vwrite, (message *mp, int from_int, -// int vectored) ); -//_PROTOTYPE(static void do_vwrite_s, (message *mp, int from_int) ); -//_PROTOTYPE(static void do_vread, (message *mp, int vectored) ); -//_PROTOTYPE(static void do_vread_s, (message *mp) ); -//_PROTOTYPE(static void do_init, (message *mp) ); -//_PROTOTYPE(static void do_int, (dpeth_t *dep) ); -//_PROTOTYPE(static void do_getstat, (message *mp) ); -//_PROTOTYPE(static void do_getstat_s, (message *mp) ); -//_PROTOTYPE(static void do_getname, (message *mp) ); -//_PROTOTYPE(static void do_stop, (message *mp) ); _PROTOTYPE(static void dp_init, (dpeth_t *dep) ); -//_PROTOTYPE(static void dp_confaddr, (dpeth_t *dep) ); _PROTOTYPE(static void dp_reinit, (dpeth_t *dep) ); _PROTOTYPE(static void dp_reset, (dpeth_t *dep) ); -//_PROTOTYPE(static void dp_check_ints, (dpeth_t *dep) ); _PROTOTYPE(static void dp_recv, (dpeth_t *dep) ); _PROTOTYPE(static void dp_send, (dpeth_t *dep) ); -//_PROTOTYPE(static void dp8390_stop, (void) ); -_PROTOTYPE(static void dp_getblock, (dpeth_t *dep, int page, - size_t offset, size_t size, void *dst) ); _PROTOTYPE(static void dp_pio8_getblock, (dpeth_t *dep, int page, size_t offset, size_t size, void *dst) ); @@ -153,62 +60,21 @@ _PROTOTYPE(static int dp_pkt2user, (dpeth_t *dep, int page, int length) ); -//_PROTOTYPE(static int dp_pkt2user_s, (dpeth_t *dep, int page, -// int length) ); -_PROTOTYPE(static void dp_user2nic, (dpeth_t *dep, iovec_dat_t *iovp, - vir_bytes offset, int nic_addr, vir_bytes count) ); -//_PROTOTYPE(static void dp_user2nic_s, (dpeth_t *dep, iovec_dat_s_t *iovp, -// vir_bytes offset, int nic_addr, vir_bytes count) ); _PROTOTYPE(static void dp_pio8_user2nic, (dpeth_t *dep, iovec_dat_t *iovp, vir_bytes offset, int nic_addr, vir_bytes count) ); -//_PROTOTYPE(static void dp_pio8_user2nic_s, (dpeth_t *dep, -// iovec_dat_s_t *iovp, vir_bytes offset, -// int nic_addr, vir_bytes count) ); _PROTOTYPE(static void dp_pio16_user2nic, (dpeth_t *dep, iovec_dat_t *iovp, vir_bytes offset, int nic_addr, vir_bytes count) ); -//_PROTOTYPE(static void dp_pio16_user2nic_s, (dpeth_t *dep, -// iovec_dat_s_t *iovp, vir_bytes offset, -// int nic_addr, vir_bytes count) ); -_PROTOTYPE(static void dp_nic2user, (dpeth_t *dep, int nic_addr, - iovec_dat_t *iovp, vir_bytes offset, vir_bytes count) ); -//_PROTOTYPE(static void dp_nic2user_s, (dpeth_t *dep, int nic_addr, -// iovec_dat_s_t *iovp, vir_bytes offset, vir_bytes count) ); _PROTOTYPE(static void dp_pio8_nic2user, (dpeth_t *dep, int nic_addr, iovec_dat_t *iovp, vir_bytes offset, vir_bytes count) ); -//_PROTOTYPE(static void dp_pio8_nic2user_s, (dpeth_t *dep, int nic_addr, -// iovec_dat_s_t *iovp, vir_bytes offset, vir_bytes count) ); _PROTOTYPE(static void dp_pio16_nic2user, (dpeth_t *dep, int nic_addr, iovec_dat_t *iovp, vir_bytes offset, vir_bytes count) ); -//_PROTOTYPE(static void dp_pio16_nic2user_s, (dpeth_t *dep, int nic_addr, -// iovec_dat_s_t *iovp, vir_bytes offset, vir_bytes count) ); _PROTOTYPE(static void dp_next_iovec, (iovec_dat_t *iovp) ); -//_PROTOTYPE(static void dp_next_iovec_s, (iovec_dat_s_t *iovp) ); _PROTOTYPE(static void conf_hw, (dpeth_t *dep) ); -//_PROTOTYPE(static void update_conf, (dpeth_t *dep, dp_conf_t *dcp) ); -_PROTOTYPE(static void map_hw_buffer, (dpeth_t *dep) ); -//_PROTOTYPE(static int calc_iovec_size, (iovec_dat_t *iovp) ); -//_PROTOTYPE(static int calc_iovec_size_s, (iovec_dat_s_t *iovp) ); _PROTOTYPE(static void reply, (dpeth_t *dep, int err, int may_block) ); -//_PROTOTYPE(static void mess_reply, (message *req, message *reply) ); _PROTOTYPE(static void get_userdata, (int user_proc, vir_bytes user_addr, vir_bytes count, void *loc_addr) ); -//_PROTOTYPE(static void get_userdata_s, (int user_proc, -// cp_grant_id_t grant, vir_bytes offset, vir_bytes count, -// void *loc_addr) ); -//_PROTOTYPE(static void put_userdata, (int user_proc, -// vir_bytes user_addr, vir_bytes count, void *loc_addr) ); -//_PROTOTYPE(static void put_userdata_s, (int user_proc, -// cp_grant_id_t grant, size_t count, void *loc_addr) ); _PROTOTYPE(static void insb, (port_t port, void *buf, size_t size) ); _PROTOTYPE(static void insw, (port_t port, void *buf, size_t size) ); -//_PROTOTYPE(static void do_vir_insb, (port_t port, int proc, -// vir_bytes buf, size_t size) ); -//_PROTOTYPE(static void do_vir_insw, (port_t port, int proc, -// vir_bytes buf, size_t size) ); -//_PROTOTYPE(static void do_vir_outsb, (port_t port, int proc, -// vir_bytes buf, size_t size) ); -//_PROTOTYPE(static void do_vir_outsw, (port_t port, int proc, -// vir_bytes buf, size_t size) ); int do_probe(dpeth_t * dep){ @@ -494,7 +360,4 @@ i < 5 ? ':' : '\n'); } - - /* Map buffer */ - map_hw_buffer(dep); /* Initialization of the dp8390 following the mandatory procedure @@ -567,13 +430,5 @@ dep->de_sendq_head= 0; dep->de_sendq_tail= 0; - if (!dep->de_prog_IO) - { - dep->de_user2nicf= dp_user2nic; -// dep->de_user2nicf_s= dp_user2nic_s; - dep->de_nic2userf= dp_nic2user; -// dep->de_nic2userf_s= dp_nic2user_s; - dep->de_getblockf= dp_getblock; - } - else if (dep->de_16bit) + if (dep->de_16bit) { dep->de_user2nicf= dp_pio16_user2nic; @@ -938,21 +793,4 @@ /*===========================================================================* - * dp_getblock * - *===========================================================================*/ -static void dp_getblock(dep, page, offset, size, dst) -dpeth_t *dep; -int page; -size_t offset; -size_t size; -void *dst; -{ -// int r; - - offset = page * DP_PAGESIZE + offset; - - memcpy(dst, dep->de_locmem + offset, size); -} - -/*===========================================================================* * dp_pio8_getblock * *===========================================================================*/ @@ -1051,54 +889,4 @@ } return OK; -} - -/*===========================================================================* - * dp_user2nic * - *===========================================================================*/ -static void dp_user2nic(dep, iovp, offset, nic_addr, count) -dpeth_t *dep; -iovec_dat_t *iovp; -vir_bytes offset; -int nic_addr; -vir_bytes count; -{ - vir_bytes vir_hw;//, vir_user; - //int bytes, i, r; - int i, r; - vir_bytes bytes; - - vir_hw = (vir_bytes)dep->de_locmem + nic_addr; - - i= 0; - while (count > 0) - { - if (i >= IOVEC_NR) - { - dp_next_iovec(iovp); - i= 0; - continue; - } - assert(i < iovp->iod_iovec_s); - if (offset >= iovp->iod_iovec[i].iov_size) - { - offset -= iovp->iod_iovec[i].iov_size; - i++; - continue; - } - bytes = iovp->iod_iovec[i].iov_size - offset; - if (bytes > count) - bytes = count; - - r= sys_vircopy(iovp->iod_proc_nr, D, - iovp->iod_iovec[i].iov_addr + offset, - SELF, D, vir_hw, bytes); - if (r != OK) - panic("DP8390", "dp_user2nic: sys_vircopy failed", r); - - count -= bytes; - vir_hw += bytes; - offset += bytes; - } - assert(count == 0); } @@ -1281,53 +1069,4 @@ /*===========================================================================* - * dp_nic2user * - *===========================================================================*/ -static void dp_nic2user(dep, nic_addr, iovp, offset, count) -dpeth_t *dep; -int nic_addr; -iovec_dat_t *iovp; -vir_bytes offset; -vir_bytes count; -{ - vir_bytes vir_hw;//, vir_user; - vir_bytes bytes; - int i, r; - - vir_hw = (vir_bytes)dep->de_locmem + nic_addr; - - i= 0; - while (count > 0) - { - if (i >= IOVEC_NR) - { - dp_next_iovec(iovp); - i= 0; - continue; - } - assert(i < iovp->iod_iovec_s); - if (offset >= iovp->iod_iovec[i].iov_size) - { - offset -= iovp->iod_iovec[i].iov_size; - i++; - continue; - } - bytes = iovp->iod_iovec[i].iov_size - offset; - if (bytes > count) - bytes = count; - - r= sys_vircopy(SELF, D, vir_hw, - iovp->iod_proc_nr, D, - iovp->iod_iovec[i].iov_addr + offset, bytes); - if (r != OK) - panic("DP8390", "dp_nic2user: sys_vircopy failed", r); - - count -= bytes; - vir_hw += bytes; - offset += bytes; - } - assert(count == 0); -} - -/*===========================================================================* * dp_pio8_nic2user * *===========================================================================*/ @@ -1514,6 +1253,5 @@ // if (dep->de_mode != DEM_ENABLED) // return; - if (!wdeth_probe(dep) && !ne_probe(dep) && !el2_probe(dep)) - { + if (!ne_probe(dep)) { printf("%s: No ethernet card found at %#lx\n", dep->de_name, dep->de_base_port); @@ -1528,45 +1266,4 @@ dep->de_flags = DEF_EMPTY; // dep->de_stat = empty_stat; -} - -/*===========================================================================* - * map_hw_buffer * - *===========================================================================*/ -static void map_hw_buffer(dep) -dpeth_t *dep; -{ -// int r; -// size_t o, size; -// char *buf, *abuf; - - if (dep->de_prog_IO) - { -#if 0 - if(debug){ - printf( - "map_hw_buffer: programmed I/O, no need to map buffer\n"); - } -#endif - dep->de_locmem = (char *)-dep->de_ramsize; /* trap errors */ - return; - }else{ - printf("map_hw_buffer: no buffer!\n"); - } - -// size = dep->de_ramsize + PAGE_SIZE; /* Add PAGE_SIZE for -// * alignment -// */ -// buf= malloc(size); -// if (buf == NULL) -// panic(__FILE__, "map_hw_buffer: cannot malloc size", size); -// o= PAGE_SIZE - ((vir_bytes)buf % PAGE_SIZE); -// abuf= buf + o; -// printf("buf at 0x%x, abuf at 0x%x\n", buf, abuf); - -// r= sys_vm_map(SELF, 1 /* map */, (vir_bytes)abuf, -// dep->de_ramsize, (phys_bytes)dep->de_linmem); -// if (r != OK) -// panic(__FILE__, "map_hw_buffer: sys_vm_map failed", r); -// dep->de_locmem = abuf; } @@ -1665,8 +1362,4 @@ } -/* - * $PchId: dp8390.c,v 1.25 2005/02/10 17:32:07 philip Exp $ - */ - /** @} */ Index: uspace/srv/hw/netif/dp8390/dp8390.h =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.h (revision 47651528be973886a1e7115cb558c2ab50e711c0) +++ uspace/srv/hw/netif/dp8390/dp8390.h (revision 8f5e252705d5ca6f72f60a2ba9d6bbf42b7f7f17) @@ -1,28 +1,2 @@ -/* - * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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 and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * * Any deviations from these conditions require written permission from the copyright holder in advance - * - * - * Disclaimer - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, 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 HOLDER OR ANY AUTHORS 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. - * - * Changes: - * 2009 ported to HelenOS, Lukas Mejdrech - */ - /** @addtogroup dp8390 * @{ @@ -44,10 +18,4 @@ */ #define DP8390_IO_SIZE 0x020 - -/* -dp8390.h - -Created: before Dec 28, 1992 by Philip Homburg -*/ /* National Semiconductor DP8390 Network Interface Controller. */ @@ -330,10 +298,8 @@ * hardwired in the board, the probe should modify these fields. * Futhermore, the probe routine should also fill in de_initf and - * de_stopf fields with the appropriate function pointers and set - * de_prog_IO iff programmed I/O is to be used. + * de_stopf fields with the appropriate function pointers. */ port_t de_base_port; phys_bytes de_linmem; - char *de_locmem; int de_irq; int de_int_pending; @@ -341,5 +307,4 @@ dp_initf_t de_initf; dp_stopf_t de_stopf; - int de_prog_IO; char de_name[sizeof("dp8390#n")]; @@ -360,12 +325,4 @@ /* should be here - read even for ne2k isa init... */ char de_pci; /* TRUE iff PCI device */ - -#if ENABLE_PCI - /* PCI config */ -// char de_pci; /* TRUE iff PCI device */ -// u8_t de_pcibus; -// u8_t de_pcidev; -// u8_t de_pcifunc; -#endif /* Do it yourself send queue */ @@ -418,11 +375,5 @@ #define DEM_ENABLED 0x2 -//#if !__minix_vmd -#define debug 1 /* Standard Minix lacks debug variable */ -//#endif - -/* - * $PchId: dp8390.h,v 1.10 2005/02/10 17:26:06 philip Exp $ - */ +#define debug 1 #endif Index: uspace/srv/hw/netif/dp8390/dp8390_module.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390_module.c (revision 47651528be973886a1e7115cb558c2ab50e711c0) +++ uspace/srv/hw/netif/dp8390/dp8390_module.c (revision 8f5e252705d5ca6f72f60a2ba9d6bbf42b7f7f17) @@ -131,5 +131,4 @@ fibril_rwlock_write_unlock(&netif_globals.lock); } - ipc_answer_0(iid, EOK); } Index: uspace/srv/hw/netif/dp8390/local.h =================================================================== --- uspace/srv/hw/netif/dp8390/local.h (revision 47651528be973886a1e7115cb558c2ab50e711c0) +++ uspace/srv/hw/netif/dp8390/local.h (revision 8f5e252705d5ca6f72f60a2ba9d6bbf42b7f7f17) @@ -1,28 +1,2 @@ -/* - * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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 and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * * Any deviations from these conditions require written permission from the copyright holder in advance - * - * - * Disclaimer - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, 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 HOLDER OR ANY AUTHORS 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. - * - * Changes: - * 2009 ported to HelenOS, Lukas Mejdrech - */ - /** @addtogroup dp8390 * @{ @@ -38,59 +12,7 @@ #include "dp8390_port.h" -/* -local.h -*/ - -/** WDETH switch. - */ -#define ENABLE_WDETH 0 - -/** NE2000 switch. - */ -#define ENABLE_NE2000 1 - -/** 3C503 switch. - */ -#define ENABLE_3C503 0 - -/** PCI support switch. - */ -#define ENABLE_PCI 0 - struct dpeth; -/* 3c503.c */ -/* * Probes a 3C503 network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -//_PROTOTYPE(int el2_probe, (struct dpeth*dep) ); - -/* ne2000.c */ -/** Probes a NE2000 or NE1000 network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ int ne_probe(struct dpeth * dep); -//_PROTOTYPE(int ne_probe, (struct dpeth *dep) ); -//_PROTOTYPE(void ne_init, (struct dpeth *dep) ); - -/* rtl8029.c */ -/* * Probes a RTL8029 network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -//_PROTOTYPE(int rtl_probe, (struct dpeth *dep) ); - -/* wdeth.c */ -/* * Probes a WDETH network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -//_PROTOTYPE(int wdeth_probe, (struct dpeth*dep) ); #endif Index: uspace/srv/hw/netif/dp8390/ne2000.c =================================================================== --- uspace/srv/hw/netif/dp8390/ne2000.c (revision 47651528be973886a1e7115cb558c2ab50e711c0) +++ uspace/srv/hw/netif/dp8390/ne2000.c (revision 8f5e252705d5ca6f72f60a2ba9d6bbf42b7f7f17) @@ -1,28 +1,2 @@ -/* - * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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 and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * * Any deviations from these conditions require written permission from the copyright holder in advance - * - * - * Disclaimer - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, 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 HOLDER OR ANY AUTHORS 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. - * - * Changes: - * 2009 ported to HelenOS, Lukas Mejdrech - */ - /** @addtogroup ne2k * @{ @@ -37,21 +11,4 @@ #include "dp8390_port.h" - -/* -ne2000.c - -Driver for the ne2000 ethernet cards. This file contains only the ne2000 -specific code, the rest is in dp8390.c - -Created: March 15, 1994 by Philip Homburg -*/ - -//#include "../drivers.h" - -//#include -//#include -//#if __minix_vmd -//#include "config.h" -//#endif #include "local.h" @@ -59,11 +16,7 @@ #include "ne2000.h" -#if ENABLE_NE2000 - /** Number of bytes to transfer. */ #define N 100 - -//#define MILLIS_TO_TICKS(m) (((m)*HZ/1000)+1) /** Sleeps for the defined millicesonds. @@ -114,5 +67,4 @@ */ static void ne_stop(dpeth_t *dep); -//_PROTOTYPE(static void milli_delay, (unsigned long millis) ); /** Initializes the NE2000 network interface. @@ -196,5 +148,4 @@ dep->de_initf= ne_init; dep->de_stopf= ne_stop; - dep->de_prog_IO= 1; return 1; } @@ -401,15 +352,4 @@ outb_ne(dep, NE_RESET, byte); } -/* -static void milli_delay(unsigned long millis) -{ - tickdelay(MILLIS_TO_TICKS(millis)); -} -*/ -#endif /* ENABLE_NE2000 */ - -/* - * $PchId: ne2000.c,v 1.10 2004/08/03 12:03:00 philip Exp $ - */ /** @} Index: uspace/srv/hw/netif/dp8390/ne2000.h =================================================================== --- uspace/srv/hw/netif/dp8390/ne2000.h (revision 47651528be973886a1e7115cb558c2ab50e711c0) +++ uspace/srv/hw/netif/dp8390/ne2000.h (revision 8f5e252705d5ca6f72f60a2ba9d6bbf42b7f7f17) @@ -1,34 +1,2 @@ -/* - * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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 and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * * Any deviations from these conditions require written permission from the copyright holder in advance - * - * - * Disclaimer - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, 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 HOLDER OR ANY AUTHORS 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. - * - * Changes: - * 2009 ported to HelenOS, Lukas Mejdrech - */ - -/* -ne2000.h - -Created: March 15, 1994 by Philip Homburg -*/ - /** @addtogroup ne2k * @{ @@ -104,8 +72,4 @@ #endif /* __NET_NETIF_NE2000_H__ */ -/* - * $PchId: ne2000.h,v 1.4 2004/08/03 12:03:20 philip Exp $ - */ - /** @} */