From f0f1e6f272741915f5b3538d86662c97fbe2eff6 Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Fri, 17 Jan 2014 12:51:32 +0000 Subject: [PATCH] Removed structures and constants from netdrv.inc that are present in macros.inc git-svn-id: svn://kolibrios.org@4467 a494cfbc-eb01-0410-851d-a64ba20cac60 --- drivers/ethernet/3c59x.asm | 4 +++- drivers/ethernet/R6040.asm | 3 ++- drivers/ethernet/RTL8029.asm | 4 +++- drivers/ethernet/RTL8139.asm | 2 ++ drivers/ethernet/RTL8169.asm | 4 +++- drivers/ethernet/bcm57xx.asm | 5 +++-- drivers/ethernet/dec21x4x.asm | 4 +++- drivers/ethernet/forcedeth.asm | 5 +++-- drivers/ethernet/i8254x.asm | 6 +++--- drivers/ethernet/i8255x.asm | 4 +++- drivers/ethernet/mtd80x.asm | 4 +++- drivers/ethernet/pcnet32.asm | 4 +++- drivers/ethernet/rhine.asm | 4 +++- drivers/ethernet/sis900.asm | 5 +++-- drivers/mii.inc | 13 +++++++++++++ drivers/netdrv.inc | 16 ---------------- 16 files changed, 53 insertions(+), 34 deletions(-) diff --git a/drivers/ethernet/3c59x.asm b/drivers/ethernet/3c59x.asm index 7df6db0ae3..a39a5b69ea 100644 --- a/drivers/ethernet/3c59x.asm +++ b/drivers/ethernet/3c59x.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; 3Com network driver for KolibriOS ;; @@ -93,6 +93,8 @@ format MS COFF __DEBUG__ = 1 __DEBUG_LEVEL__ = 2 +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/R6040.asm b/drivers/ethernet/R6040.asm index 33a249aad0..bc479f1d7e 100644 --- a/drivers/ethernet/R6040.asm +++ b/drivers/ethernet/R6040.asm @@ -46,7 +46,8 @@ format MS COFF TX_DMA_BURST = 4 - +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/RTL8029.asm b/drivers/ethernet/RTL8029.asm index a1aef5ee40..6a44f0c838 100644 --- a/drivers/ethernet/RTL8029.asm +++ b/drivers/ethernet/RTL8029.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; RTL8029/ne2000 driver for KolibriOS ;; @@ -27,6 +27,8 @@ format MS COFF __DEBUG__ = 1 __DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/RTL8139.asm b/drivers/ethernet/RTL8139.asm index 2d27e60aaa..7448f51187 100644 --- a/drivers/ethernet/RTL8139.asm +++ b/drivers/ethernet/RTL8139.asm @@ -34,6 +34,8 @@ format MS COFF __DEBUG__ = 1 __DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/RTL8169.asm b/drivers/ethernet/RTL8169.asm index 07b093e405..d32aef92c9 100644 --- a/drivers/ethernet/RTL8169.asm +++ b/drivers/ethernet/RTL8169.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; RTL8169 driver for KolibriOS ;; @@ -32,6 +32,8 @@ format MS COFF NUM_TX_DESC = 4 NUM_RX_DESC = 4 +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/bcm57xx.asm b/drivers/ethernet/bcm57xx.asm index 1ad31e2cba..a34c2a8216 100644 --- a/drivers/ethernet/bcm57xx.asm +++ b/drivers/ethernet/bcm57xx.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; Broadcom NetXtreme 57xx driver for KolibriOS ;; @@ -27,7 +27,8 @@ format MS COFF __DEBUG__ = 1 __DEBUG_LEVEL__ = 2 - +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/dec21x4x.asm b/drivers/ethernet/dec21x4x.asm index 3fd00c2743..2fddc5c5a8 100644 --- a/drivers/ethernet/dec21x4x.asm +++ b/drivers/ethernet/dec21x4x.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; DEC 21x4x driver for KolibriOS ;; @@ -34,6 +34,8 @@ format MS COFF __DEBUG__ = 1 __DEBUG_LEVEL__ = 2 +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/forcedeth.asm b/drivers/ethernet/forcedeth.asm index 04f49189fb..b376fbadd7 100644 --- a/drivers/ethernet/forcedeth.asm +++ b/drivers/ethernet/forcedeth.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; FORCEDETH.INC ;; @@ -42,10 +42,11 @@ format MS COFF RX_RING = 4 TX_RING = 4 +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' -include '../struct.inc' include '../netdrv.inc' public START diff --git a/drivers/ethernet/i8254x.asm b/drivers/ethernet/i8254x.asm index 30bad5d445..6ebe9cfc43 100644 --- a/drivers/ethernet/i8254x.asm +++ b/drivers/ethernet/i8254x.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; i8254x driver for KolibriOS ;; @@ -29,11 +29,11 @@ format MS COFF MAX_PKT_SIZE = 16384 ; Maximum packet size - +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' -include '../struct.inc' include '../netdrv.inc' public START diff --git a/drivers/ethernet/i8255x.asm b/drivers/ethernet/i8255x.asm index 56ac437ef9..2bf66d52e8 100644 --- a/drivers/ethernet/i8255x.asm +++ b/drivers/ethernet/i8255x.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; i8255x (Intel eepro 100) driver for KolibriOS ;; @@ -32,6 +32,8 @@ format MS COFF __DEBUG__ = 1 __DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/mtd80x.asm b/drivers/ethernet/mtd80x.asm index f5d1449124..da7dd222e4 100644 --- a/drivers/ethernet/mtd80x.asm +++ b/drivers/ethernet/mtd80x.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; MTD80x driver for KolibriOS ;; @@ -28,6 +28,8 @@ format MS COFF NUM_TX_DESC = 4 NUM_RX_DESC = 4 +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/pcnet32.asm b/drivers/ethernet/pcnet32.asm index af4d941040..4eceb9c5b5 100644 --- a/drivers/ethernet/pcnet32.asm +++ b/drivers/ethernet/pcnet32.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; AMD PCnet driver for KolibriOS ;; @@ -28,6 +28,8 @@ format MS COFF TX_RING_SIZE = 4 RX_RING_SIZE = 4 +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/rhine.asm b/drivers/ethernet/rhine.asm index f6e2738784..68ee01b0da 100644 --- a/drivers/ethernet/rhine.asm +++ b/drivers/ethernet/rhine.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2010-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2010-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; rhine.asm ;; @@ -52,6 +52,8 @@ format MS COFF TX_DMA_BURST = 4 +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/ethernet/sis900.asm b/drivers/ethernet/sis900.asm index 49726a0107..7d9a08d3d8 100644 --- a/drivers/ethernet/sis900.asm +++ b/drivers/ethernet/sis900.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; Ethernet driver for KolibriOS ;; @@ -197,7 +197,8 @@ format MS COFF EEDONE = 0x00000200 EEGNT = 0x00000100 - +include '../struct.inc' +include '../macros.inc' include '../proc32.inc' include '../imports.inc' include '../fdo.inc' diff --git a/drivers/mii.inc b/drivers/mii.inc index 566d6a3f35..f37dad66c4 100644 --- a/drivers/mii.inc +++ b/drivers/mii.inc @@ -1,3 +1,16 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; ;; +;; Copyright (C) KolibriOS team 2010-2014. All rights reserved. ;; +;; Distributed under terms of the GNU General Public License ;; +;; ;; +;; mii.inc - Media Independent Interface routines for KolibriOS ;; +;; ;; +;; GNU GENERAL PUBLIC LICENSE ;; +;; Version 2, June 1991 ;; +;; ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + ; Generic MII registers. MII_BMCR = 0x00 ; Basic mode control register diff --git a/drivers/netdrv.inc b/drivers/netdrv.inc index aee9091885..8ad5fd3460 100644 --- a/drivers/netdrv.inc +++ b/drivers/netdrv.inc @@ -25,9 +25,6 @@ include 'mii.inc' ; Kernel variables PAGESIZE = 4096 - PG_SW = 0x003 - PG_NOCACHE = 0x018 - ; network driver types @@ -94,19 +91,6 @@ macro allocate_and_clear dest, size, err { } -struc IOCTL { - .handle dd ? - .io_code dd ? - .input dd ? - .inp_size dd ? - .output dd ? - .out_size dd ? -} - -virtual at edx - IOCTL IOCTL -end virtual - if used null_op align 4