Index: uspace/srv/hw/netif/dp8390/dp8390.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.c (revision aa1e20236a50e31ba269fa374f0aaaf153f72f11) +++ uspace/srv/hw/netif/dp8390/dp8390.c (revision e0854e33805675a78a1d12de31ddb0871ec199a5) @@ -1,2 +1,41 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Martin Decky + * 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 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/* + * This code is based upon the NE2000 driver for MINIX, + * distributed according to a BSD-style license. + * + * Copyright (c) 1987, 1997, 2006 Vrije Universiteit + * Copyright (c) 1992, 1994 Philip Homburg + * Copyright (c) 1996 G. Falzoni + * + */ + /** @addtogroup dp8390 * @{ @@ -125,5 +164,5 @@ fprintf(stderr, "dp8390: should not be sending\n"); dep->de_flags |= DEF_SEND_AVAIL; - dep->de_flags &= ~(DEF_PACK_SEND | DEF_PACK_RECV); + dep->de_flags &= ~DEF_PACK_SEND; return EBUSY; @@ -163,5 +202,5 @@ return EOK; - dep->de_flags &= ~(DEF_PACK_SEND | DEF_PACK_RECV); + dep->de_flags &= ~DEF_PACK_SEND; return EOK; @@ -441,5 +480,5 @@ } - dep->de_flags &= ~(DEF_PACK_SEND | DEF_PACK_RECV); + dep->de_flags &= ~DEF_PACK_SEND; } @@ -552,6 +591,4 @@ } - dep->de_flags |= DEF_PACK_RECV; - nil_received_msg(nil_phone, device_id, packet, SERVICE_NONE); Index: uspace/srv/hw/netif/dp8390/dp8390.h =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.h (revision aa1e20236a50e31ba269fa374f0aaaf153f72f11) +++ uspace/srv/hw/netif/dp8390/dp8390.h (revision e0854e33805675a78a1d12de31ddb0871ec199a5) @@ -1,2 +1,41 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Martin Decky + * 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 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/* + * This code is based upon the NE2000 driver for MINIX, + * distributed according to a BSD-style license. + * + * Copyright (c) 1987, 1997, 2006 Vrije Universiteit + * Copyright (c) 1992, 1994 Philip Homburg + * Copyright (c) 1996 G. Falzoni + * + */ + /** @addtogroup dp8390 * @{ @@ -271,7 +310,5 @@ #define DEF_EMPTY 0x000 #define DEF_PACK_SEND 0x001 -#define DEF_PACK_RECV 0x002 #define DEF_SEND_AVAIL 0x004 -#define DEF_READING 0x010 #define DEF_PROMISC 0x040 #define DEF_MULTI 0x080 Index: uspace/srv/hw/netif/dp8390/ne2000.c =================================================================== --- uspace/srv/hw/netif/dp8390/ne2000.c (revision aa1e20236a50e31ba269fa374f0aaaf153f72f11) +++ uspace/srv/hw/netif/dp8390/ne2000.c (revision e0854e33805675a78a1d12de31ddb0871ec199a5) @@ -1,2 +1,41 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Martin Decky + * 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 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/* + * This code is based upon the NE2000 driver for MINIX, + * distributed according to a BSD-style license. + * + * Copyright (c) 1987, 1997, 2006 Vrije Universiteit + * Copyright (c) 1992, 1994 Philip Homburg + * Copyright (c) 1996 G. Falzoni + * + */ + /** @addtogroup ne2k * @{ Index: uspace/srv/hw/netif/dp8390/ne2000.h =================================================================== --- uspace/srv/hw/netif/dp8390/ne2000.h (revision aa1e20236a50e31ba269fa374f0aaaf153f72f11) +++ uspace/srv/hw/netif/dp8390/ne2000.h (revision e0854e33805675a78a1d12de31ddb0871ec199a5) @@ -1,2 +1,41 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Martin Decky + * 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 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/* + * This code is based upon the NE2000 driver for MINIX, + * distributed according to a BSD-style license. + * + * Copyright (c) 1987, 1997, 2006 Vrije Universiteit + * Copyright (c) 1992, 1994 Philip Homburg + * Copyright (c) 1996 G. Falzoni + * + */ + /** @addtogroup ne2k * @{