Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev Merge changes of sys/pci/if_rl.c rev. 1.8->1.10. (fr...
details: https://anonhg.NetBSD.org/src/rev/3cdbd58aeacc
branches: trunk
changeset: 485307:3cdbd58aeacc
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Mon Apr 24 15:25:00 2000 +0000
description:
Merge changes of sys/pci/if_rl.c rev. 1.8->1.10. (from kern/9870)
Also remove unused pbase, vbase and PCI_CAP_PWRMGMT declarations.
diffstat:
sys/dev/cardbus/if_rl_cardbus.c | 17 +++++++----------
sys/dev/ic/rtl81x9.c | 14 +++++++-------
sys/dev/ic/rtl81x9reg.h | 3 +--
sys/dev/pci/if_rl_pci.c | 17 +++++++----------
4 files changed, 22 insertions(+), 29 deletions(-)
diffs (174 lines):
diff -r a5dcb5bd6fe6 -r 3cdbd58aeacc sys/dev/cardbus/if_rl_cardbus.c
--- a/sys/dev/cardbus/if_rl_cardbus.c Mon Apr 24 15:15:05 2000 +0000
+++ b/sys/dev/cardbus/if_rl_cardbus.c Mon Apr 24 15:25:00 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rl_cardbus.c,v 1.3 2000/04/19 08:44:32 haya Exp $ */
+/* $NetBSD: if_rl_cardbus.c,v 1.4 2000/04/24 15:25:00 tsutsui Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
* All rights reserved.
@@ -163,12 +163,9 @@
struct device *parent, *self;
void *aux;
{
- int s;
-#ifndef RL_USEIOSPACE
- vm_offset_t pbase, vbase;
-#endif
+ int s, pmreg;
u_char eaddr[ETHER_ADDR_LEN];
- u_int32_t command;
+ pcireg_t command;
struct rl_cardbus_softc *csc = (struct rl_cardbus_softc *)self;
struct rl_softc *sc = &csc->sc_rl;
struct cardbus_attach_args *ca = aux;
@@ -195,10 +192,10 @@
/*
* Handle power management nonsense.
*/
- if (cardbus_get_capability(cc, cf, csc->sc_tag, PCI_CAP_PWRMGMT, 0, 0)) {
- command = cardbus_conf_read(cc, cf, csc->sc_tag, RL_PCI_PWRMGMTCTRL);
+ if (cardbus_get_capability(cc, cf, csc->sc_tag, PCI_CAP_PWRMGMT, &pmreg, 0)) {
+ command = cardbus_conf_read(cc, cf, csc->sc_tag, pmreg + 4);
if (command & RL_PSTATE_MASK) {
- u_int32_t iobase, membase, irq;
+ pcireg_t iobase, membase, irq;
/* Save important PCI config data. */
iobase = cardbus_conf_read(cc, cf, csc->sc_tag, RL_PCI_LOIO);
@@ -210,7 +207,7 @@
"-- setting to D0\n", sc->sc_dev.dv_xname,
command & RL_PSTATE_MASK);
command &= 0xFFFFFFFC;
- cardbus_conf_write(cc, cf, csc->sc_tag, RL_PCI_PWRMGMTCTRL, command);
+ cardbus_conf_write(cc, cf, csc->sc_tag, pmreg + 4, command);
/* Restore PCI config data. */
cardbus_conf_write(cc, cf, csc->sc_tag, RL_PCI_LOIO, iobase);
diff -r a5dcb5bd6fe6 -r 3cdbd58aeacc sys/dev/ic/rtl81x9.c
--- a/sys/dev/ic/rtl81x9.c Mon Apr 24 15:15:05 2000 +0000
+++ b/sys/dev/ic/rtl81x9.c Mon Apr 24 15:25:00 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9.c,v 1.1 2000/04/10 07:42:56 haya Exp $ */
+/* $NetBSD: rtl81x9.c,v 1.2 2000/04/24 15:25:00 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -191,7 +191,7 @@
struct rl_softc *sc;
int addr;
{
- register int d, i;
+ int d, i;
d = addr | RL_EECMD_READ;
@@ -222,7 +222,7 @@
int addr;
u_int16_t *dest;
{
- register int i;
+ int i;
u_int16_t word = 0;
/* Enter EEPROM access mode. */
@@ -301,7 +301,7 @@
STATIC void rl_mii_sync(sc)
struct rl_softc *sc;
{
- register int i;
+ int i;
MII_SET(RL_MII_DIR|RL_MII_DATAOUT);
@@ -667,7 +667,7 @@
void rl_reset(sc)
struct rl_softc *sc;
{
- register int i;
+ int i;
CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_RESET);
@@ -1393,7 +1393,7 @@
#ifdef NS
case AF_NS:
{
- register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
+ struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
if (ns_nullhost(*ina))
ina->x_host = *(union ns_host *)
@@ -1487,7 +1487,7 @@
STATIC void rl_stop(sc)
struct rl_softc *sc;
{
- register int i;
+ int i;
struct ifnet *ifp;
ifp = &sc->ethercom.ec_if;
diff -r a5dcb5bd6fe6 -r 3cdbd58aeacc sys/dev/ic/rtl81x9reg.h
--- a/sys/dev/ic/rtl81x9reg.h Mon Apr 24 15:15:05 2000 +0000
+++ b/sys/dev/ic/rtl81x9reg.h Mon Apr 24 15:25:00 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9reg.h,v 1.1 2000/04/10 07:42:56 haya Exp $ */
+/* $NetBSD: rtl81x9reg.h,v 1.2 2000/04/24 15:25:00 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -396,7 +396,6 @@
#define RL_PCI_LOIO 0x10
#define RL_PCI_LOMEM 0x14
-#define RL_PCI_PWRMGMTCTRL 0xE0 /* 16 bits */
#define RL_PSTATE_MASK 0x0003
#define RL_PSTATE_D0 0x0000
diff -r a5dcb5bd6fe6 -r 3cdbd58aeacc sys/dev/pci/if_rl_pci.c
--- a/sys/dev/pci/if_rl_pci.c Mon Apr 24 15:15:05 2000 +0000
+++ b/sys/dev/pci/if_rl_pci.c Mon Apr 24 15:25:00 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rl_pci.c,v 1.2 2000/04/19 08:44:32 haya Exp $ */
+/* $NetBSD: if_rl_pci.c,v 1.3 2000/04/24 15:25:00 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -215,12 +215,9 @@
struct device *parent, *self;
void *aux;
{
- int s;
-#ifndef RL_USEIOSPACE
- vm_offset_t pbase, vbase;
-#endif
+ int s, pmreg;
u_char eaddr[ETHER_ADDR_LEN];
- u_int32_t command;
+ pcireg_t command;
struct rl_pci_softc *psc = (struct rl_pci_softc *)self;
struct rl_softc *sc = &psc->sc_rl;
u_int16_t rl_did = 0;
@@ -238,10 +235,10 @@
* Handle power management nonsense.
*/
- if (pci_get_capability(pc, pa->pa_tag, PCI_CAP_PWRMGMT, 0, 0)) {
- command = pci_conf_read(pc, pa->pa_tag, RL_PCI_PWRMGMTCTRL);
+ if (pci_get_capability(pc, pa->pa_tag, PCI_CAP_PWRMGMT, &pmreg, 0)) {
+ command = pci_conf_read(pc, pa->pa_tag, pmreg + 4);
if (command & RL_PSTATE_MASK) {
- u_int32_t iobase, membase, irq;
+ pcireg_t iobase, membase, irq;
/* Save important PCI config data. */
iobase = pci_conf_read(pc, pa->pa_tag, RL_PCI_LOIO);
@@ -253,7 +250,7 @@
"-- setting to D0\n", sc->sc_dev.dv_xname,
command & RL_PSTATE_MASK);
command &= 0xFFFFFFFC;
- pci_conf_write(pc, pa->pa_tag, RL_PCI_PWRMGMTCTRL, command);
+ pci_conf_write(pc, pa->pa_tag, pmreg + 4, command);
/* Restore PCI config data. */
pci_conf_write(pc, pa->pa_tag, RL_PCI_LOIO, iobase);
Home |
Main Index |
Thread Index |
Old Index