Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add another address, vector configuration of Nereid ethernet.

This commit is contained in:
isaki 2002-01-14 04:25:47 +00:00
parent 626454530f
commit 81fa322c19
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/x68k/conf/ALL
View File

@ -1,4 +1,4 @@
# $NetBSD: ALL,v 1.47 2001/12/24 11:38:05 minoura Exp $
# $NetBSD: ALL,v 1.48 2002/01/14 04:27:13 isaki Exp $
#
# ALL -- everything that currently exist including experimental
@ -6,7 +6,7 @@
include "arch/x68k/conf/std.x68k"
#ident "ALL-$Revision: 1.47 $"
#ident "ALL-$Revision: 1.48 $"
maxusers 32
@ -253,6 +253,7 @@ audio* at vs?
## Network interfaces
ne* at intio0 addr 0xece300 intr 249 # Nereid Ethernet
ne* at intio0 addr 0xeceb00 intr 248 # Nereid Ethernet
neptune0 at intio0 addr 0xece000 intr 249 # Neptune-X
neptune1 at intio0 addr 0xece400 intr 249 # Neptune-X at alt. addr.
ne* at neptune? addr 0x300 # NE2000 or clone

5
sys/arch/x68k/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.71 2001/12/28 12:22:01 martin Exp $
# $NetBSD: GENERIC,v 1.72 2002/01/14 04:27:13 isaki Exp $
#
# GENERIC machine description file
#
@ -20,7 +20,7 @@
include "arch/x68k/conf/std.x68k"
#ident "GENERIC-$Revision: 1.71 $"
#ident "GENERIC-$Revision: 1.72 $"
maxusers 8
@ -267,6 +267,7 @@ audio* at vs?
## Network interfaces
ne* at intio0 addr 0xece300 intr 249 # Nereid Ethernet
ne* at intio0 addr 0xeceb00 intr 248 # Nereid Ethernet
neptune0 at intio0 addr 0xece000 intr 249 # Neptune-X
neptune1 at intio0 addr 0xece400 intr 249 # Neptune-X at alt. addr.
ne* at neptune? addr 0x300 # NE2000 or clone

5
sys/arch/x68k/conf/INSTALL
View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.45 2001/12/06 04:13:12 minoura Exp $
# $NetBSD: INSTALL,v 1.46 2002/01/14 04:27:13 isaki Exp $
#
# INSTALL -- installation kernel.
@ -6,7 +6,7 @@
include "arch/x68k/conf/std.x68k"
#ident "INSTALL-$Revision: 1.45 $"
#ident "INSTALL-$Revision: 1.46 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@ -260,6 +260,7 @@ pseudo-device sram # battery-backuped static RAM
## Network interfaces
ne* at intio0 addr 0xece300 intr 249 # Nereid Ethernet
ne* at intio0 addr 0xeceb00 intr 248 # Nereid Ethernet
neptune0 at intio0 addr 0xece000 intr 249 # Neptune-X
neptune1 at intio0 addr 0xece400 intr 249 # Neptune-X at alt. addr.
ne* at neptune? addr 0x300 # NE2000 or clone

13
sys/arch/x68k/dev/if_ne_intio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ne_intio.c,v 1.1 2001/11/11 01:39:03 isaki Exp $ */
/* $NetBSD: if_ne_intio.c,v 1.2 2002/01/14 04:25:47 isaki Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@ -80,8 +80,10 @@
#include <arch/x68k/dev/intiovar.h>
#define NE_INTIO_ADDR (0xece300)
#define NE_INTIO_INTR (0xf9)
#define NE_INTIO_ADDR (0xece300)
#define NE_INTIO_ADDR2 (0xeceb00)
#define NE_INTIO_INTR (0xf9)
#define NE_INTIO_INTR2 (0xf8)
static int ne_intio_match(struct device *, struct cfdata *, void *);
static void ne_intio_attach(struct device *, struct device *, void *);
@ -109,9 +111,8 @@ ne_intio_match(struct device *parent, struct cfdata *cf, void *aux)
ia->ia_intr = NE_INTIO_INTR;
/* fixed parameters */
if (ia->ia_addr != NE_INTIO_ADDR)
return 0;
if (ia->ia_intr != NE_INTIO_INTR)
if (!(ia->ia_addr == NE_INTIO_ADDR && ia->ia_intr == NE_INTIO_INTR ) &&
!(ia->ia_addr == NE_INTIO_ADDR2 && ia->ia_intr == NE_INTIO_INTR2) )
return 0;
/* Make sure this is a valid NE2000 I/O address */