KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Removed structures and constants from netdrv.inc that are present in macros.inc

Browse Source 
git-svn-id: svn://kolibrios.org@4467 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2014-01-17 12:51:32 +00:00
parent e38e007365
commit f0f1e6f272
16 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ethernet/3c59x.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; 3Com network driver for KolibriOS ;; ;; 3Com network driver for KolibriOS ;;
@ -93,6 +93,8 @@ format MS COFF
__DEBUG__ = 1 __DEBUG__ = 1
__DEBUG_LEVEL__ = 2 __DEBUG_LEVEL__ = 2
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

3
drivers/ethernet/R6040.asm
View File

@ -46,7 +46,8 @@ format MS COFF
TX_DMA_BURST = 4 TX_DMA_BURST = 4
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

4
drivers/ethernet/RTL8029.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; RTL8029/ne2000 driver for KolibriOS ;; ;; RTL8029/ne2000 driver for KolibriOS ;;
@ -27,6 +27,8 @@ format MS COFF
__DEBUG__ = 1 __DEBUG__ = 1
__DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only __DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

2
drivers/ethernet/RTL8139.asm
View File

@ -34,6 +34,8 @@ format MS COFF
__DEBUG__ = 1 __DEBUG__ = 1
__DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only __DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

4
drivers/ethernet/RTL8169.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; RTL8169 driver for KolibriOS ;; ;; RTL8169 driver for KolibriOS ;;
@ -32,6 +32,8 @@ format MS COFF
NUM_TX_DESC = 4 NUM_TX_DESC = 4
NUM_RX_DESC = 4 NUM_RX_DESC = 4
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

5
drivers/ethernet/bcm57xx.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; Broadcom NetXtreme 57xx driver for KolibriOS ;; ;; Broadcom NetXtreme 57xx driver for KolibriOS ;;
@ -27,7 +27,8 @@ format MS COFF
__DEBUG__ = 1 __DEBUG__ = 1
__DEBUG_LEVEL__ = 2 __DEBUG_LEVEL__ = 2
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

4
drivers/ethernet/dec21x4x.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; DEC 21x4x driver for KolibriOS ;; ;; DEC 21x4x driver for KolibriOS ;;
@ -34,6 +34,8 @@ format MS COFF
__DEBUG__ = 1 __DEBUG__ = 1
__DEBUG_LEVEL__ = 2 __DEBUG_LEVEL__ = 2
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

5
drivers/ethernet/forcedeth.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; FORCEDETH.INC ;; ;; FORCEDETH.INC ;;
@ -42,10 +42,11 @@ format MS COFF
RX_RING = 4 RX_RING = 4
TX_RING = 4 TX_RING = 4
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'
include '../struct.inc'
include '../netdrv.inc' include '../netdrv.inc'
public START public START

6
drivers/ethernet/i8254x.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; i8254x driver for KolibriOS ;; ;; i8254x driver for KolibriOS ;;
@ -29,11 +29,11 @@ format MS COFF
MAX_PKT_SIZE = 16384 ; Maximum packet size MAX_PKT_SIZE = 16384 ; Maximum packet size
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'
include '../struct.inc'
include '../netdrv.inc' include '../netdrv.inc'
public START public START

4
drivers/ethernet/i8255x.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; i8255x (Intel eepro 100) driver for KolibriOS ;; ;; i8255x (Intel eepro 100) driver for KolibriOS ;;
@ -32,6 +32,8 @@ format MS COFF
__DEBUG__ = 1 __DEBUG__ = 1
__DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only __DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

4
drivers/ethernet/mtd80x.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; MTD80x driver for KolibriOS ;; ;; MTD80x driver for KolibriOS ;;
@ -28,6 +28,8 @@ format MS COFF
NUM_TX_DESC = 4 NUM_TX_DESC = 4
NUM_RX_DESC = 4 NUM_RX_DESC = 4
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

4
drivers/ethernet/pcnet32.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; AMD PCnet driver for KolibriOS ;; ;; AMD PCnet driver for KolibriOS ;;
@ -28,6 +28,8 @@ format MS COFF
TX_RING_SIZE = 4 TX_RING_SIZE = 4
RX_RING_SIZE = 4 RX_RING_SIZE = 4
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

4
drivers/ethernet/rhine.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; rhine.asm ;; ;; rhine.asm ;;
@ -52,6 +52,8 @@ format MS COFF
TX_DMA_BURST = 4 TX_DMA_BURST = 4
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

5
drivers/ethernet/sis900.asm
View File

@ -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 ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; Ethernet driver for KolibriOS ;; ;; Ethernet driver for KolibriOS ;;
@ -197,7 +197,8 @@ format MS COFF
EEDONE = 0x00000200 EEDONE = 0x00000200
EEGNT = 0x00000100 EEGNT = 0x00000100
include '../struct.inc'
include '../macros.inc'
include '../proc32.inc' include '../proc32.inc'
include '../imports.inc' include '../imports.inc'
include '../fdo.inc' include '../fdo.inc'

13
drivers/mii.inc
View File

@ -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. ; Generic MII registers.
MII_BMCR = 0x00 ; Basic mode control register MII_BMCR = 0x00 ; Basic mode control register

16
drivers/netdrv.inc
View File

@ -25,9 +25,6 @@ include 'mii.inc'
; Kernel variables ; Kernel variables
PAGESIZE = 4096 PAGESIZE = 4096
PG_SW = 0x003
PG_NOCACHE = 0x018
; network driver types ; 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 if used null_op
align 4 align 4