From ebea20aed76f0b7ba5d0a1771b35fcaa068c0831 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 27 Jul 2001 07:47:35 +0000 Subject: [PATCH] Minor nits merged from my stable tree: o kill blank line that I introduced in cardinfo.h o Delete unused variable wasinactive. o return 0 from pccard_resume. o Set the state and lastsate initially to be empty. o move comment above code for interrupt dispatching. o Powerstate interface is now available as of 430002, not 500000 (note that this change will be not 100% correct since the power state stuff didn't enter current until well after 500000, but it is good enough for the two branche we have going now). --- sys/pccard/cardinfo.h | 1 - sys/pccard/pccard.c | 3 +-- sys/pccard/pcic.c | 1 + sys/pccard/pcic_isa.c | 2 +- sys/pccard/pcic_pci.c | 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/pccard/cardinfo.h b/sys/pccard/cardinfo.h index f31427e401a6..3294bb3d112a 100644 --- a/sys/pccard/cardinfo.h +++ b/sys/pccard/cardinfo.h @@ -93,7 +93,6 @@ * we were suspended. Others do not. We make no use of this functionality * at this time. */ - enum cardstate { noslot, empty, suspend, filled, inactive }; /* diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index 274918d5aae3..d8187d6d2aa3 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -166,8 +166,6 @@ disable_slot(struct slot *slt) static void disable_slot_to(struct slot *slt) { - int wasinactive; - disable_slot(slt); if (slt->state == empty) printf("pccard: card removed, slot %d\n", slt->slotnum); @@ -704,4 +702,5 @@ pccard_resume(device_t dev) struct slot *slt = PCCARD_DEVICE2SOFTC(dev); slt->ctrl->resume(slt); + return (0); } diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index 460f12354bff..397ab6331cf4 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -349,6 +349,7 @@ pcic_attach(device_t dev) /* Check for changes */ pcic_setb(sp, PCIC_POWER, PCIC_PCPWRE | PCIC_DISRST); + sp->slt->laststate = sp->slt->state = empty; pcic_do_stat_delta(sp); } diff --git a/sys/pccard/pcic_isa.c b/sys/pccard/pcic_isa.c index 4383e25b7923..564e932a546b 100644 --- a/sys/pccard/pcic_isa.c +++ b/sys/pccard/pcic_isa.c @@ -373,7 +373,7 @@ static int pcicintr1(void *arg) { int slot, s; - unsigned char chg; + u_int8_t chg; struct pcic_softc *sc = (struct pcic_softc *) arg; struct pcic_slot *sp = &sc->slots[0]; diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c index 71575d2f22ff..f73a6bb1480f 100644 --- a/sys/pccard/pcic_pci.c +++ b/sys/pccard/pcic_pci.c @@ -408,9 +408,9 @@ pcic_pci_intr(void *arg) /* Ack the interrupt, all of them to be safe */ bus_space_write_4(sp->bst, sp->bsh, 0, 0xffffffff); } - stat = bus_space_read_4(sp->bst, sp->bsh, CB_SOCKET_STATE); /* Now call children interrupts if any */ + stat = bus_space_read_4(sp->bst, sp->bsh, CB_SOCKET_STATE); if (sp->intr && (stat & CB_SS_CD) == 0) sp->intr(sp->argp); } @@ -447,7 +447,7 @@ pcic_pci_probe(device_t dev) return (ENXIO); device_set_desc(dev, desc); -#if __FreeBSD_version > 500000 +#if __FreeBSD_version >= 430002 /* * Take us out of power down mode. */