Page MenuHomeFreeBSD
Differential D4544 Diff 11201 sys/dev/pccard/pccard.c

Changeset View

Standalone View

View Options

sys/dev/pccard/pccard.c

Context not available.
const char *name, int type, int count, const char *format); const char *name, int type, int count, const char *format);
static int pccard_print_child(device_t dev, device_t child); static int pccard_print_child(device_t dev, device_t child);
static int pccard_set_resource(device_t dev, device_t child, int type, static int pccard_set_resource(device_t dev, device_t child, int type,
int rid, u_long start, u_long count); int rid, rman_res_t start, rman_res_t count);
static int pccard_get_resource(device_t dev, device_t child, int type, static int pccard_get_resource(device_t dev, device_t child, int type,
int rid, u_long *startp, u_long *countp); int rid, rman_res_t *startp, rman_res_t *countp);
static void pccard_delete_resource(device_t dev, device_t child, int type, static void pccard_delete_resource(device_t dev, device_t child, int type,
int rid); int rid);
static int pccard_set_res_flags(device_t dev, device_t child, int type, static int pccard_set_res_flags(device_t dev, device_t child, int type,
Context not available.
uintptr_t *result); uintptr_t *result);
static void pccard_driver_added(device_t dev, driver_t *driver); static void pccard_driver_added(device_t dev, driver_t *driver);
static struct resource *pccard_alloc_resource(device_t dev, static struct resource *pccard_alloc_resource(device_t dev,
device_t child, int type, int *rid, u_long start, device_t child, int type, int *rid, rman_res_t start,
u_long end, u_long count, u_int flags); rman_res_t end, rman_res_t count, u_int flags);
static int pccard_release_resource(device_t dev, device_t child, int type, static int pccard_release_resource(device_t dev, device_t child, int type,
int rid, struct resource *r); int rid, struct resource *r);
static void pccard_child_detached(device_t parent, device_t dev); static void pccard_child_detached(device_t parent, device_t dev);
Context not available.
struct pccard_ce_iospace *ios; struct pccard_ce_iospace *ios;
struct pccard_ce_memspace *mems; struct pccard_ce_memspace *mems;
device_t bus; device_t bus;
u_long start, end, len; rman_res_t start, end, len;
int i, rid, spaces; int i, rid, spaces;
if (pf->pf_flags & PFF_ENABLED) { if (pf->pf_flags & PFF_ENABLED) {
Context not available.
if (start) if (start)
end = start + ios->length - 1; end = start + ios->length - 1;
else else
end = ~0UL; end = ~0;
DEVPRINTF((bus, "I/O rid %d start %#lx end %#lx\n", DEVPRINTF((bus, "I/O rid %d start %#jx end %#jx\n",
i, start, end)); i, start, end));
rid = i; rid = i;
len = ios->length; len = ios->length;
Context not available.
if (start) if (start)
end = start + mems->length - 1; end = start + mems->length - 1;
else else
end = ~0UL; end = ~0;
DEVPRINTF((bus, "Memory rid %d start %#lx end %#lx\ncardaddr %#lx hostaddr %#lx length %#lx\n", DEVPRINTF((bus, "Memory rid %d start %#jx end %#jx\ncardaddr %#jx hostaddr %#jx length %#jx\n",
i, start, end, mems->cardaddr, mems->hostaddr, i, start, end, (rman_res_t)mems->cardaddr, (rman_res_t)mems->hostaddr,
jhbUnsubmitted
Done
Inline Actions

Since you've changed the 'cardaddr', 'length', and 'hostaddr' fields in these structures (pccard_ce_iospace and pccard_ce_memspace) to rman_res_t, these casts seem redundant? Perhaps these were from an earlier version before the structures were changed?

jhb: Since you've changed the 'cardaddr', 'length', and 'hostaddr' fields in these structures…
mems->length)); (rman_res_t)mems->length));
rid = i; rid = i;
len = mems->length; len = mems->length;
r = bus_alloc_resource(bus, SYS_RES_MEMORY, &rid, r = bus_alloc_resource(bus, SYS_RES_MEMORY, &rid,
Context not available.
device_printf(pf->sc->dev, device_printf(pf->sc->dev,
"function_free: Resource still owned by " "function_free: Resource still owned by "
"child, oops. " "child, oops. "
"(type=%d, rid=%d, addr=%#lx)\n", "(type=%d, rid=%d, addr=%#jx)\n",
rle->type, rle->rid, rle->type, rle->rid,
rman_get_start(rle->res)); rman_get_start(rle->res));
BUS_RELEASE_RESOURCE(device_get_parent(pf->sc->dev), BUS_RELEASE_RESOURCE(device_get_parent(pf->sc->dev),
Context not available.
} }
static void static void
pccard_mfc_adjust_iobase(struct pccard_function *pf, bus_addr_t addr, pccard_mfc_adjust_iobase(struct pccard_function *pf, rman_res_t addr,
bus_addr_t offset, bus_size_t size) rman_res_t offset, rman_res_t size)
{ {
bus_size_t iosize, tmp; bus_size_t iosize, tmp;
Context not available.
&pf->ccr_rid, 0, ~0, PCCARD_MEM_PAGE_SIZE, RF_ACTIVE); &pf->ccr_rid, 0, ~0, PCCARD_MEM_PAGE_SIZE, RF_ACTIVE);
if (!pf->ccr_res) if (!pf->ccr_res)
goto bad; goto bad;
DEVPRINTF((dev, "ccr_res == %#lx-%#lx, base=%#x\n", DEVPRINTF((dev, "ccr_res == %#jx-%#jx, base=%#x\n",
rman_get_start(pf->ccr_res), rman_get_end(pf->ccr_res), rman_get_start(pf->ccr_res), rman_get_end(pf->ccr_res),
pf->ccr_base)); pf->ccr_base));
CARD_SET_RES_FLAGS(device_get_parent(dev), dev, SYS_RES_MEMORY, CARD_SET_RES_FLAGS(device_get_parent(dev), dev, SYS_RES_MEMORY,
Context not available.
static int static int
pccard_set_resource(device_t dev, device_t child, int type, int rid, pccard_set_resource(device_t dev, device_t child, int type, int rid,
u_long start, u_long count) rman_res_t start, rman_res_t count)
{ {
struct pccard_ivar *devi = PCCARD_IVAR(child); struct pccard_ivar *devi = PCCARD_IVAR(child);
struct resource_list *rl = &devi->resources; struct resource_list *rl = &devi->resources;
Context not available.
static int static int
pccard_get_resource(device_t dev, device_t child, int type, int rid, pccard_get_resource(device_t dev, device_t child, int type, int rid,
u_long *startp, u_long *countp) rman_res_t *startp, rman_res_t *countp)
{ {
struct pccard_ivar *devi = PCCARD_IVAR(child); struct pccard_ivar *devi = PCCARD_IVAR(child);
struct resource_list *rl = &devi->resources; struct resource_list *rl = &devi->resources;
Context not available.
static struct resource * static struct resource *
pccard_alloc_resource(device_t dev, device_t child, int type, int *rid, pccard_alloc_resource(device_t dev, device_t child, int type, int *rid,
u_long start, u_long end, u_long count, u_int flags) rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
{ {
struct pccard_ivar *dinfo; struct pccard_ivar *dinfo;
struct resource_list_entry *rle = 0; struct resource_list_entry *rle = 0;
int passthrough = (device_get_parent(child) != dev); int passthrough = (device_get_parent(child) != dev);
int isdefault = (start == 0 && end == ~0UL && count == 1); int isdefault = (start == 0 && end == ~0 && count == 1);
struct resource *r = NULL; struct resource *r = NULL;
/* XXX I'm no longer sure this is right */ /* XXX I'm no longer sure this is right */
Context not available.
if (!rle) { if (!rle) {
device_printf(dev, "Allocated resource not found, " device_printf(dev, "Allocated resource not found, "
"%d %#x %#lx %#lx\n", "%d %#x %#jx %#jx\n",
type, rid, rman_get_start(r), rman_get_size(r)); type, rid, rman_get_start(r), rman_get_size(r));
return ENOENT; return ENOENT;
} }
Context not available.