summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/pccard/pccard.c16
-rw-r--r--sys/dev/pccard/pccard_cis.c4
-rw-r--r--sys/dev/pccard/pccardchip.h40
-rw-r--r--sys/dev/pccard/pccardvar.h37
-rw-r--r--sys/dev/pcic/i82365.c223
-rw-r--r--sys/dev/pcic/i82365_isa.c18
-rw-r--r--sys/dev/pcic/i82365_isasubr.c2
-rw-r--r--sys/dev/pcic/i82365_isavar.h6
-rw-r--r--sys/dev/pcic/i82365var.h67
9 files changed, 179 insertions, 234 deletions
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 39c939c..67a4ae1 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -65,16 +65,16 @@ int pccard_verbose = 1;
int pccard_verbose = 0;
#endif
-int pccard_print __P((void *, const char *));
+int pccard_print(void *, const char *);
-static __inline void pccard_socket_enable __P((pccard_chipset_tag_t,
- pccard_chipset_handle_t *));
-static __inline void pccard_socket_disable __P((pccard_chipset_tag_t,
- pccard_chipset_handle_t *));
+static __inline void pccard_socket_enable(pccard_chipset_tag_t,
+ pccard_chipset_handle_t *);
+static __inline void pccard_socket_disable(pccard_chipset_tag_t,
+ pccard_chipset_handle_t *);
-int pccard_card_intr __P((void *));
+int pccard_card_intr(void *);
#ifdef PCCARDDEBUG
-int pccard_card_intrdebug __P((void *));
+int pccard_card_intrdebug(void *);
#endif
int
@@ -557,7 +557,7 @@ void *
pccard_intr_establish(pf, ipl, ih_fct, ih_arg)
struct pccard_function *pf;
int ipl;
- int (*ih_fct) __P((void *));
+ int (*ih_fct)(void *);
void *ih_arg;
{
void *ret;
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index e09c52a..aeb10ba 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -65,7 +65,7 @@ struct cis_state {
struct pccard_function *pf;
};
-int pccard_parse_cis_tuple __P((struct pccard_tuple *, void *));
+int pccard_parse_cis_tuple(struct pccard_tuple *, void *);
void
pccard_read_cis(sc)
@@ -99,7 +99,7 @@ pccard_read_cis(sc)
int
pccard_scan_cis(dev, fct, arg)
struct device *dev;
- int (*fct) __P((struct pccard_tuple *, void *));
+ int (*fct)(struct pccard_tuple *, void *);
void *arg;
{
struct pccard_softc *sc = (struct pccard_softc *) dev;
diff --git a/sys/dev/pccard/pccardchip.h b/sys/dev/pccard/pccardchip.h
index b2a6635..638526a 100644
--- a/sys/dev/pccard/pccardchip.h
+++ b/sys/dev/pccard/pccardchip.h
@@ -54,39 +54,39 @@ typedef int pccard_mem_handle_t;
struct pccard_chip_functions {
/* memory space allocation */
- int (*mem_alloc) __P((pccard_chipset_handle_t, bus_size_t,
- struct pccard_mem_handle *));
- void (*mem_free) __P((pccard_chipset_handle_t,
- struct pccard_mem_handle *));
+ int (*mem_alloc)(pccard_chipset_handle_t, bus_size_t,
+ struct pccard_mem_handle *);
+ void (*mem_free)(pccard_chipset_handle_t,
+ struct pccard_mem_handle *);
/* memory space window mapping */
- int (*mem_map) __P((pccard_chipset_handle_t, int, bus_addr_t,
+ int (*mem_map)(pccard_chipset_handle_t, int, bus_addr_t,
bus_size_t, struct pccard_mem_handle *,
- bus_addr_t *, int *));
- void (*mem_unmap) __P((pccard_chipset_handle_t, int));
+ bus_addr_t *, int *);
+ void (*mem_unmap)(pccard_chipset_handle_t, int);
/* I/O space allocation */
- int (*io_alloc) __P((pccard_chipset_handle_t, bus_addr_t,
- bus_size_t, bus_size_t, struct pccard_io_handle *));
- void (*io_free) __P((pccard_chipset_handle_t,
- struct pccard_io_handle *));
+ int (*io_alloc) (pccard_chipset_handle_t, bus_addr_t,
+ bus_size_t, bus_size_t, struct pccard_io_handle *);
+ void (*io_free) (pccard_chipset_handle_t,
+ struct pccard_io_handle *);
/* I/O space window mapping */
- int (*io_map) __P((pccard_chipset_handle_t, int, bus_addr_t,
- bus_size_t, struct pccard_io_handle *, int *));
- void (*io_unmap) __P((pccard_chipset_handle_t, int));
+ int (*io_map) (pccard_chipset_handle_t, int, bus_addr_t,
+ bus_size_t, struct pccard_io_handle *, int *);
+ void (*io_unmap) (pccard_chipset_handle_t, int);
/* interrupt glue */
- void *(*intr_establish) __P((pccard_chipset_handle_t,
- struct pccard_function *, int, int (*)(void *), void *));
- void (*intr_disestablish) __P((pccard_chipset_handle_t, void *));
+ void *(*intr_establish) (pccard_chipset_handle_t,
+ struct pccard_function *, int, int (*)(void *), void *);
+ void (*intr_disestablish) (pccard_chipset_handle_t, void *);
/* card enable/disable */
- void (*socket_enable) __P((pccard_chipset_handle_t));
- void (*socket_disable) __P((pccard_chipset_handle_t));
+ void (*socket_enable) (pccard_chipset_handle_t);
+ void (*socket_disable) (pccard_chipset_handle_t);
/* card detection */
- int (*card_detect) __P((pccard_chipset_handle_t));
+ int (*card_detect)(pccard_chipset_handle_t);
};
/* Memory space functions. */
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index 8544247..e6ad7d3 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -48,6 +48,7 @@ struct pccard_io_handle {
bus_addr_t addr; /* resulting address in bus space */
bus_size_t size; /* size of i/o space */
int flags; /* misc. information */
+ int width;
};
#define PCCARD_IO_ALLOCATED 0x01 /* i/o space was allocated */
@@ -62,6 +63,8 @@ struct pccard_mem_handle {
bus_size_t size; /* size of mem space */
pccard_mem_handle_t mhandle; /* opaque memory handle */
bus_size_t realsize; /* how much we really allocated */
+ long offset;
+ int kind;
};
/* pccard itself */
@@ -128,7 +131,7 @@ struct pccard_function {
int pf_ccr_window;
long pf_mfc_iobase;
long pf_mfc_iomax;
- int (*ih_fct) __P((void *));
+ int (*ih_fct)(void *);
void *ih_arg;
int ih_ipl;
int pf_flags;
@@ -185,7 +188,7 @@ struct pccard_softc {
};
void
-pccardbus_if_setup __P((struct pccard_softc*));
+pccardbus_if_setup(struct pccard_softc*);
struct pccard_cis_quirk {
int32_t manufacturer;
@@ -211,11 +214,11 @@ struct pccard_tuple {
bus_space_handle_t memh;
};
-void pccard_read_cis __P((struct pccard_softc *));
+void pccard_read_cis(struct pccard_softc *);
void pccard_check_cis_quirks(device_t);
void pccard_print_cis(device_t);
-int pccard_scan_cis __P((struct device * dev,
- int (*) (struct pccard_tuple *, void *), void *));
+int pccard_scan_cis(struct device * dev,
+ int (*) (struct pccard_tuple *, void *), void *);
#define pccard_cis_read_1(tuple, idx0) \
(bus_space_read_1((tuple)->memt, (tuple)->memh, (tuple)->mult*(idx0)))
@@ -247,16 +250,16 @@ int pccard_scan_cis __P((struct device * dev,
#define PCCARD_SPACE_MEMORY 1
#define PCCARD_SPACE_IO 2
-int pccard_ccr_read __P((struct pccard_function *, int));
-void pccard_ccr_write __P((struct pccard_function *, int, int));
+int pccard_ccr_read(struct pccard_function *, int);
+void pccard_ccr_write(struct pccard_function *, int, int);
#define pccard_mfc(sc) (STAILQ_FIRST(&(sc)->card.pf_head) && \
STAILQ_NEXT(STAILQ_FIRST(&(sc)->card.pf_head),pf_list))
-void pccard_function_init __P((struct pccard_function *,
- struct pccard_config_entry *));
-int pccard_function_enable __P((struct pccard_function *));
-void pccard_function_disable __P((struct pccard_function *));
+void pccard_function_init(struct pccard_function *,
+ struct pccard_config_entry *);
+int pccard_function_enable(struct pccard_function *);
+void pccard_function_disable(struct pccard_function *);
#define pccard_io_alloc(pf, start, size, align, pciop) \
(pccard_chip_io_alloc((pf)->sc->pct, pf->sc->pch, (start), \
@@ -265,9 +268,9 @@ void pccard_function_disable __P((struct pccard_function *));
#define pccard_io_free(pf, pciohp) \
(pccard_chip_io_free((pf)->sc->pct, (pf)->sc->pch, (pciohp)))
-int pccard_io_map __P((struct pccard_function *, int, bus_addr_t,
- bus_size_t, struct pccard_io_handle *, int *));
-void pccard_io_unmap __P((struct pccard_function *, int));
+int pccard_io_map(struct pccard_function *, int, bus_addr_t,
+ bus_size_t, struct pccard_io_handle *, int *);
+void pccard_io_unmap(struct pccard_function *, int);
#define pccard_mem_alloc(pf, size, pcmhp) \
(pccard_chip_mem_alloc((pf)->sc->pct, (pf)->sc->pch, (size), (pcmhp)))
@@ -282,6 +285,6 @@ void pccard_io_unmap __P((struct pccard_function *, int));
#define pccard_mem_unmap(pf, window) \
(pccard_chip_mem_unmap((pf)->sc->pct, (pf)->sc->pch, (window)))
-void *pccard_intr_establish __P((struct pccard_function *, int,
- int (*) (void *), void *));
-void pccard_intr_disestablish __P((struct pccard_function *, void *));
+void *pccard_intr_establish(struct pccard_function *, int,
+ int (*) (void *), void *);
+void pccard_intr_disestablish(struct pccard_function *, void *);
diff --git a/sys/dev/pcic/i82365.c b/sys/dev/pcic/i82365.c
index 97dcefc..0a1b38a 100644
--- a/sys/dev/pcic/i82365.c
+++ b/sys/dev/pcic/i82365.c
@@ -56,10 +56,6 @@
#include <dev/pcic/i82365reg.h>
#include <dev/pcic/i82365var.h>
-#ifdef __FreeBSD__
-#define delay(x) DELAY(x)
-#endif
-
#ifdef PCICDEBUG
int pcic_debug = 0;
#define DPRINTF(arg) if (pcic_debug) printf arg;
@@ -87,27 +83,26 @@ static void pcic_attach_socket(device_t, struct pcic_handle *);
static void pcic_init_socket(struct pcic_handle *);
#if XXX
-int pcic_submatch __P((struct device *, struct cfdata *, void *));
-int pcic_print __P((void *arg, const char *pnp));
+int pcic_submatch (struct device *, struct cfdata *, void *);
#endif
-int pcic_intr_socket __P((struct pcic_handle *));
+int pcic_intr_socket (struct pcic_handle *);
-void pcic_attach_card __P((struct pcic_handle *));
-void pcic_detach_card __P((struct pcic_handle *, int));
-void pcic_deactivate_card __P((struct pcic_handle *));
+void pcic_attach_card (struct pcic_handle *);
+void pcic_detach_card (struct pcic_handle *, int);
+void pcic_deactivate_card (struct pcic_handle *);
-void pcic_chip_do_mem_map __P((struct pcic_handle *, int));
-void pcic_chip_do_io_map __P((struct pcic_handle *, int));
+void pcic_chip_do_mem_map (struct pcic_handle *, int);
+void pcic_chip_do_io_map (struct pcic_handle *, int);
-void pcic_create_event_thread __P((void *));
-void pcic_event_thread __P((void *));
+void pcic_create_event_thread (void *);
+void pcic_event_thread (void *);
-void pcic_queue_event __P((struct pcic_handle *, int));
+void pcic_queue_event (struct pcic_handle *, int);
-static void pcic_wait_ready __P((struct pcic_handle *));
+static void pcic_wait_ready (struct pcic_handle *);
-static u_int8_t st_pcic_read __P((struct pcic_handle *, int));
-static void st_pcic_write __P((struct pcic_handle *, int, u_int8_t));
+static u_int8_t st_pcic_read (struct pcic_handle *, int);
+static void st_pcic_write (struct pcic_handle *, int, u_int8_t);
int
pcic_ident_ok(ident)
@@ -373,6 +368,7 @@ pcic_attach_socket(device_t dev, struct pcic_handle *h)
* XXX be BAD.
*/
device_add_child(dev, NULL, -1);
+ device_set_ivars(dev, h);
/* if there's actually a pccard device attached, initialize the slot */
/* XXX WE SHOULD MOVE THIS TO CHILD ATTACHED */
@@ -613,40 +609,6 @@ pcic_submatch(parent, cf, aux)
}
#endif
-#if XXX
-int
-pcic_print(arg, pnp)
- void *arg;
- const char *pnp;
-{
- struct pccardbus_attach_args *paa = arg;
- struct pcic_handle *h = (struct pcic_handle *) paa->pch;
-
- /* Only "pccard"s can attach to "pcic"s... easy. */
- if (pnp)
- printf("pccard at %s", pnp);
-
- switch (h->sock) {
- case C0SA:
- printf(" controller 0 socket 0");
- break;
- case C0SB:
- printf(" controller 0 socket 1");
- break;
- case C1SA:
- printf(" controller 1 socket 0");
- break;
- case C1SB:
- printf(" controller 1 socket 1");
- break;
- default:
- panic("unknown pcic socket");
- }
-
- return (UNCONF);
-}
-#endif
-
int
pcic_intr(arg)
void *arg;
@@ -790,12 +752,9 @@ pcic_deactivate_card(h)
}
int
-pcic_chip_mem_alloc(pch, size, pcmhp)
- pccard_chipset_handle_t pch;
- bus_size_t size;
- struct pccard_mem_handle *pcmhp;
+pcic_chip_mem_alloc(struct pcic_handle *h, bus_size_t size,
+ struct pccard_mem_handle *pcmhp)
{
- struct pcic_handle *h = (struct pcic_handle *) pch;
bus_space_handle_t memh;
bus_addr_t addr;
bus_size_t sizepg;
@@ -839,11 +798,8 @@ pcic_chip_mem_alloc(pch, size, pcmhp)
}
void
-pcic_chip_mem_free(pch, pcmhp)
- pccard_chipset_handle_t pch;
- struct pccard_mem_handle *pcmhp;
+pcic_chip_mem_free(struct pcic_handle *h, struct pccard_mem_handle *pcmhp)
{
- struct pcic_handle *h = (struct pcic_handle *) pch;
struct pcic_softc *sc = (struct pcic_softc *)(h->ph_parent);
sc->subregionmask |= pcmhp->mhandle;
@@ -906,9 +862,7 @@ static struct mem_map_index_st {
};
void
-pcic_chip_do_mem_map(h, win)
- struct pcic_handle *h;
- int win;
+pcic_chip_do_mem_map(struct pcic_handle *h, int win)
{
int reg;
@@ -944,7 +898,7 @@ pcic_chip_do_mem_map(h, win)
reg |= (mem_map_index[win].memenable | PCIC_ADDRWIN_ENABLE_MEMCS16);
pcic_write(h, PCIC_ADDRWIN_ENABLE, reg);
- delay(100);
+ DELAY(100);
#ifdef PCICDEBUG
{
@@ -964,16 +918,10 @@ pcic_chip_do_mem_map(h, win)
}
int
-pcic_chip_mem_map(pch, kind, card_addr, size, pcmhp, offsetp, windowp)
- pccard_chipset_handle_t pch;
- int kind;
- bus_addr_t card_addr;
- bus_size_t size;
- struct pccard_mem_handle *pcmhp;
- bus_addr_t *offsetp;
- int *windowp;
+pcic_chip_mem_map(struct pcic_handle *h, int kind, bus_addr_t card_addr,
+ bus_size_t size, struct pccard_mem_handle *pcmhp, bus_addr_t *offsetp,
+ int *windowp)
{
- struct pcic_handle *h = (struct pcic_handle *) pch;
bus_addr_t busaddr;
long card_offset;
int i, win;
@@ -1034,11 +982,8 @@ pcic_chip_mem_map(pch, kind, card_addr, size, pcmhp, offsetp, windowp)
}
void
-pcic_chip_mem_unmap(pch, window)
- pccard_chipset_handle_t pch;
- int window;
+pcic_chip_mem_unmap(struct pcic_handle *h, int window)
{
- struct pcic_handle *h = (struct pcic_handle *) pch;
int reg;
if (window >= (sizeof(mem_map_index) / sizeof(mem_map_index[0])))
@@ -1052,14 +997,9 @@ pcic_chip_mem_unmap(pch, window)
}
int
-pcic_chip_io_alloc(pch, start, size, align, pcihp)
- pccard_chipset_handle_t pch;
- bus_addr_t start;
- bus_size_t size;
- bus_size_t align;
- struct pccard_io_handle *pcihp;
+pcic_chip_io_alloc(struct pcic_handle *h, bus_addr_t start, bus_size_t size,
+ bus_size_t align, struct pccard_io_handle *pcihp)
{
- struct pcic_handle *h = (struct pcic_handle *) pch;
bus_space_tag_t iot;
bus_space_handle_t ioh;
bus_addr_t ioaddr;
@@ -1102,9 +1042,7 @@ pcic_chip_io_alloc(pch, start, size, align, pcihp)
}
void
-pcic_chip_io_free(pch, pcihp)
- pccard_chipset_handle_t pch;
- struct pccard_io_handle *pcihp;
+pcic_chip_io_free(struct pcic_handle *h, struct pccard_io_handle *pcihp)
{
bus_space_tag_t iot = pcihp->iot;
bus_space_handle_t ioh = pcihp->ioh;
@@ -1163,9 +1101,7 @@ static struct io_map_index_st {
};
void
-pcic_chip_do_io_map(h, win)
- struct pcic_handle *h;
- int win;
+pcic_chip_do_io_map(struct pcic_handle *h, int win)
{
int reg;
@@ -1193,15 +1129,9 @@ pcic_chip_do_io_map(h, win)
}
int
-pcic_chip_io_map(pch, width, offset, size, pcihp, windowp)
- pccard_chipset_handle_t pch;
- int width;
- bus_addr_t offset;
- bus_size_t size;
- struct pccard_io_handle *pcihp;
- int *windowp;
+pcic_chip_io_map(struct pcic_handle *h, int width, bus_addr_t offset,
+ bus_size_t size, struct pccard_io_handle *pcihp, int *windowp)
{
- struct pcic_handle *h = (struct pcic_handle *) pch;
bus_addr_t ioaddr = pcihp->addr + offset;
int i, win;
#ifdef PCICDEBUG
@@ -1249,11 +1179,8 @@ pcic_chip_io_map(pch, width, offset, size, pcihp, windowp)
}
void
-pcic_chip_io_unmap(pch, window)
- pccard_chipset_handle_t pch;
- int window;
+pcic_chip_io_unmap(struct pcic_handle *h, int window)
{
- struct pcic_handle *h = (struct pcic_handle *) pch;
int reg;
if (window >= (sizeof(io_map_index) / sizeof(io_map_index[0])))
@@ -1267,15 +1194,14 @@ pcic_chip_io_unmap(pch, window)
}
static void
-pcic_wait_ready(h)
- struct pcic_handle *h;
+pcic_wait_ready(struct pcic_handle *h)
{
int i;
for (i = 0; i < 10000; i++) {
if (pcic_read(h, PCIC_IF_STATUS) & PCIC_IF_STATUS_READY)
return;
- delay(500);
+ DELAY(500);
#ifdef PCICDEBUG
if (pcic_debug) {
if ((i>5000) && (i%100 == 99))
@@ -1291,10 +1217,8 @@ pcic_wait_ready(h)
}
void
-pcic_chip_socket_enable(pch)
- pccard_chipset_handle_t pch;
+pcic_chip_socket_enable(struct pcic_handle *h)
{
- struct pcic_handle *h = (struct pcic_handle *) pch;
int cardtype, reg, win;
/* this bit is mostly stolen from pcic_attach_card */
@@ -1307,7 +1231,7 @@ pcic_chip_socket_enable(pch)
* wait 300ms until power fails (Tpf). Then, wait 100ms since
* we are changing Vcc (Toff).
*/
- delay((300 + 100) * 1000);
+ DELAY((300 + 100) * 1000);
#ifdef VADEM_POWER_HACK
bus_space_write_1(sc->iot, sc->ioh, PCIC_REG_INDEX, 0x0e);
@@ -1331,7 +1255,7 @@ pcic_chip_socket_enable(pch)
* some machines require some more time to be settled
* (300ms is added here).
*/
- delay((100 + 20 + 300) * 1000);
+ DELAY((100 + 20 + 300) * 1000);
pcic_write(h, PCIC_PWRCTL, PCIC_PWRCTL_DISABLE_RESETDRV | PCIC_PWRCTL_OE
| PCIC_PWRCTL_PWR_ENABLE);
@@ -1340,7 +1264,7 @@ pcic_chip_socket_enable(pch)
/*
* hold RESET at least 10us.
*/
- delay(10);
+ DELAY(10);
/* clear the reset flag */
@@ -1348,7 +1272,7 @@ pcic_chip_socket_enable(pch)
/* wait 20ms as per pc card standard (r2.01) section 4.3.6 */
- delay(20000);
+ DELAY(20000);
/* wait for the chip to finish initializing */
@@ -1393,11 +1317,8 @@ pcic_chip_socket_enable(pch)
}
void
-pcic_chip_socket_disable(pch)
- pccard_chipset_handle_t pch;
+pcic_chip_socket_disable(struct pcic_handle *h)
{
- struct pcic_handle *h = (struct pcic_handle *) pch;
-
DPRINTF(("pcic_chip_socket_disable\n"));
/* power down the socket */
@@ -1407,13 +1328,11 @@ pcic_chip_socket_disable(pch)
/*
* wait 300ms until power fails (Tpf).
*/
- delay(300 * 1000);
+ DELAY(300 * 1000);
}
static u_int8_t
-st_pcic_read(h, idx)
- struct pcic_handle *h;
- int idx;
+st_pcic_read(struct pcic_handle *h, int idx)
{
if (idx != -1) {
bus_space_write_1(h->ph_bus_t, h->ph_bus_h, PCIC_REG_INDEX,
@@ -1423,10 +1342,7 @@ st_pcic_read(h, idx)
}
static void
-st_pcic_write(h, idx, data)
- struct pcic_handle *h;
- int idx;
- u_int8_t data;
+st_pcic_write(struct pcic_handle *h, int idx, u_int8_t data)
{
if (idx != -1) {
bus_space_write_1(h->ph_bus_t, h->ph_bus_h, PCIC_REG_INDEX,
@@ -1439,11 +1355,64 @@ st_pcic_write(h, idx, data)
int pcic_activate_resource(device_t dev, device_t child, int type, int rid,
struct resource *r)
{
- return bus_generic_activate_resource(dev, child, type, rid, r);
+ int err;
+ int sz;
+ int win;
+ bus_addr_t off;
+ struct pcic_handle *h = (struct pcic_handle *) device_get_ivars(dev);
+
+ sz = rman_get_end(r) - rman_get_start(r) + 1;
+ switch (type) {
+ case SYS_RES_IOPORT:
+ err = pcic_chip_io_alloc(h, rman_get_start(r), sz, 0,
+ &h->io[rid]);
+ if (err)
+ return err;
+ err = pcic_chip_io_map(h, 0, 0, sz, &h->io[rid], &win);
+ if (err) {
+ pcic_chip_io_free(h, &h->io[rid]);
+ return err;
+ }
+ break;
+ case SYS_RES_IRQ:
+ /* XXX */
+ break;
+ case SYS_RES_MEMORY:
+ err = pcic_chip_mem_alloc(h, sz, &h->mem[rid]);
+ if (err)
+ return err;
+ err = pcic_chip_mem_map(h, 0, 0, sz, &h->mem[rid], &off, &win);
+ if (err) {
+ pcic_chip_mem_free(h, &h->mem[rid]);
+ return err;
+ }
+ break;
+ default:
+ break;
+ }
+ err = bus_generic_activate_resource(dev, child, type, rid, r);
+ return (err);
}
int pcic_deactivate_resource(device_t dev, device_t child, int type, int rid,
struct resource *r)
{
- return bus_generic_deactivate_resource(dev, child, type, rid, r);
+ struct pcic_handle *h = (struct pcic_handle *) device_get_ivars(dev);
+ int err = 0;
+
+ switch (type) {
+ case SYS_RES_IOPORT:
+ pcic_chip_io_unmap(h, rid);
+ pcic_chip_io_free(h, &h->io[rid]);
+ case SYS_RES_IRQ:
+ /* XXX */
+ break;
+ case SYS_RES_MEMORY:
+ pcic_chip_mem_unmap(h, rid);
+ pcic_chip_mem_free(h, &h->mem[rid]);
+ default:
+ break;
+ }
+ err = bus_generic_deactivate_resource(dev, child, type, rid, r);
+ return (err);
}
diff --git a/sys/dev/pcic/i82365_isa.c b/sys/dev/pcic/i82365_isa.c
index 6968fe8..2be6a4a7 100644
--- a/sys/dev/pcic/i82365_isa.c
+++ b/sys/dev/pcic/i82365_isa.c
@@ -71,24 +71,6 @@ static struct isa_pnp_id pcic_ids[] = {
int pcic_isa_probe(device_t dev);
int pcic_isa_attach(device_t dev);
-static struct pccard_chip_functions pcic_isa_functions = {
- pcic_chip_mem_alloc,
- pcic_chip_mem_free,
- pcic_chip_mem_map,
- pcic_chip_mem_unmap,
-
- pcic_chip_io_alloc,
- pcic_chip_io_free,
- pcic_chip_io_map,
- pcic_chip_io_unmap,
-
- pcic_isa_chip_intr_establish,
- pcic_isa_chip_intr_disestablish,
-
- pcic_chip_socket_enable,
- pcic_chip_socket_disable,
-};
-
int
pcic_isa_probe(device_t dev)
{
diff --git a/sys/dev/pcic/i82365_isasubr.c b/sys/dev/pcic/i82365_isasubr.c
index 23cef41..8c43940 100644
--- a/sys/dev/pcic/i82365_isasubr.c
+++ b/sys/dev/pcic/i82365_isasubr.c
@@ -220,7 +220,7 @@ pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg)
pccard_chipset_handle_t pch;
struct pccard_function *pf;
int ipl;
- int (*fct) __P((void *));
+ int (*fct) (void *);
void *arg;
{
#define IST_LEVEL 1
diff --git a/sys/dev/pcic/i82365_isavar.h b/sys/dev/pcic/i82365_isavar.h
index 652f579..bc0f2d1 100644
--- a/sys/dev/pcic/i82365_isavar.h
+++ b/sys/dev/pcic/i82365_isavar.h
@@ -37,9 +37,9 @@ extern int pcic_isa_intr_alloc_mask;
* Establish/disestablish interrupts for PCCARD functions.
*/
-void *pcic_isa_chip_intr_establish __P((pccard_chipset_handle_t,
- struct pccard_function *, int, int (*) (void *), void *));
-void pcic_isa_chip_intr_disestablish __P((pccard_chipset_handle_t, void *));
+void *pcic_isa_chip_intr_establish(pccard_chipset_handle_t,
+ struct pccard_function *, int, int (*) (void *), void *);
+void pcic_isa_chip_intr_disestablish(pccard_chipset_handle_t, void *);
/*
* Figure out how wide the ISA bus is...
diff --git a/sys/dev/pcic/i82365var.h b/sys/dev/pcic/i82365var.h
index 6ff9671..7858f12 100644
--- a/sys/dev/pcic/i82365var.h
+++ b/sys/dev/pcic/i82365var.h
@@ -51,26 +51,17 @@ struct pcic_handle {
struct device *ph_parent;
bus_space_tag_t ph_bus_t; /* I/O or MEM? I don't mind */
bus_space_handle_t ph_bus_h;
- u_int8_t (* ph_read) __P((struct pcic_handle*, int));
- void (* ph_write) __P((struct pcic_handle *, int, u_int8_t));
+ u_int8_t (* ph_read)(struct pcic_handle*, int);
+ void (* ph_write)(struct pcic_handle *, int, u_int8_t);
int vendor;
int sock;
int flags;
int laststate;
int memalloc;
- struct {
- bus_addr_t addr;
- bus_size_t size;
- long offset;
- int kind;
- } mem[PCIC_MEM_WINS];
+ struct pccard_mem_handle mem[PCIC_MEM_WINS];
int ioalloc;
- struct {
- bus_addr_t addr;
- bus_size_t size;
- int width;
- } io[PCIC_IO_WINS];
+ struct pccard_io_handle io[PCIC_IO_WINS];
int ih_irq;
struct device *pccard;
@@ -144,36 +135,36 @@ struct pcic_softc {
};
-int pcic_ident_ok __P((int));
-int pcic_vendor __P((struct pcic_handle *));
-char *pcic_vendor_to_string __P((int));
+int pcic_ident_ok(int);
+int pcic_vendor(struct pcic_handle *);
+char *pcic_vendor_to_string(int);
void pcic_attach(device_t dev);
void pcic_attach_sockets(device_t dev);
-int pcic_intr __P((void *arg));
-
-int pcic_chip_mem_alloc __P((pccard_chipset_handle_t, bus_size_t,
- struct pccard_mem_handle *));
-void pcic_chip_mem_free __P((pccard_chipset_handle_t,
- struct pccard_mem_handle *));
-int pcic_chip_mem_map __P((pccard_chipset_handle_t, int, bus_addr_t,
- bus_size_t, struct pccard_mem_handle *, bus_addr_t *, int *));
-void pcic_chip_mem_unmap __P((pccard_chipset_handle_t, int));
-
-int pcic_chip_io_alloc __P((pccard_chipset_handle_t, bus_addr_t,
- bus_size_t, bus_size_t, struct pccard_io_handle *));
-void pcic_chip_io_free __P((pccard_chipset_handle_t,
- struct pccard_io_handle *));
-int pcic_chip_io_map __P((pccard_chipset_handle_t, int, bus_addr_t,
- bus_size_t, struct pccard_io_handle *, int *));
-void pcic_chip_io_unmap __P((pccard_chipset_handle_t, int));
-
-void pcic_chip_socket_enable __P((pccard_chipset_handle_t));
-void pcic_chip_socket_disable __P((pccard_chipset_handle_t));
+int pcic_intr(void *arg);
+
+struct pccard_handle;
+
+int pcic_chip_mem_alloc(struct pcic_handle *, bus_size_t,
+ struct pccard_mem_handle *);
+void pcic_chip_mem_free(struct pcic_handle *, struct pccard_mem_handle *);
+int pcic_chip_mem_map(struct pcic_handle *, int, bus_addr_t,
+ bus_size_t, struct pccard_mem_handle *, bus_addr_t *, int *);
+void pcic_chip_mem_unmap(struct pcic_handle *, int);
+
+int pcic_chip_io_alloc(struct pcic_handle *, bus_addr_t, bus_size_t,
+ bus_size_t, struct pccard_io_handle *);
+void pcic_chip_io_free(struct pcic_handle *, struct pccard_io_handle *);
+int pcic_chip_io_map(struct pcic_handle *, int, bus_addr_t,
+ bus_size_t, struct pccard_io_handle *, int *);
+void pcic_chip_io_unmap(struct pcic_handle *, int);
+
+void pcic_chip_socket_enable(struct pcic_handle *);
+void pcic_chip_socket_disable(struct pcic_handle *);
#if 0
-static __inline int pcic_read __P((struct pcic_handle *, int));
+static __inline int pcic_read(struct pcic_handle *, int);
static __inline int
pcic_read(h, idx)
struct pcic_handle *h;
@@ -185,7 +176,7 @@ pcic_read(h, idx)
return (bus_space_read_1(h->sc->iot, h->sc->ioh, PCIC_REG_DATA));
}
-static __inline void pcic_write __P((struct pcic_handle *, int, int));
+static __inline void pcic_write(struct pcic_handle *, int, int);
static __inline void
pcic_write(h, idx, data)
struct pcic_handle *h;
OpenPOWER on IntegriCloud