jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

- Restore correct operation of bt_mca.

Browse Source 
- Work around a problem not yet solved in the tree (but solved in mine.)

	device_get_ivars() should never be cast to a struct resource_list *
	The solution, under review, involves the creation of a
	device_get_resource_list() function.  More later.
This commit is contained in:
Matthew N. Dodd 1999-10-09 04:02:02 +00:00
parent a832055165
commit 8a28315fb6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=52050
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/dev/buslogic/bt_mca.c
View File

@ -106,8 +106,11 @@ bt_mca_release_resources (device_t dev)
bt_free_softc(dev);
}
#define BT_MCA_PROBE 0
#define BT_MCA_ATTACH 1
static int
bt_mca_alloc_resources(device_t dev)
bt_mca_alloc_resources(device_t dev, int mode)
{
struct resource * io = NULL;
struct resource * irq = NULL;
@ -117,21 +120,30 @@ bt_mca_alloc_resources(device_t dev)
rid = 0;
io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0, ~0, 1, RF_ACTIVE);
if (io == NULL)
if (io == NULL) {
printf("bt_mca_alloc_resources() failed to allocate IOPORT\n");
return (ENOMEM);
}
rid = 0;
irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
0, ~0, 1, RF_ACTIVE);
if (irq == NULL)
goto bad;
if (mode == BT_MCA_ATTACH) {
rid = 0;
drq = bus_alloc_resource(dev, SYS_RES_DRQ, &rid,
rid = 0;
irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
0, ~0, 1, RF_ACTIVE);
if (drq == NULL)
goto bad;
if (irq == NULL) {
printf("bt_mca_alloc_resources() failed to allocate IRQ\n");
goto bad;
}
rid = 0;
drq = bus_alloc_resource(dev, SYS_RES_DRQ, &rid,
0, ~0, 1, RF_ACTIVE);
if (drq == NULL) {
printf("bt_mca_alloc_resources() failed to allocate DRQ\n");
goto bad;
}
}
bt_init_softc(dev, io, irq, drq);
return (0);
@ -174,7 +186,7 @@ bt_mca_probe (device_t dev)
mca_add_iospace(dev, iobase, iosize);
/* And allocate them */
bt_mca_alloc_resources(dev);
bt_mca_alloc_resources(dev, BT_MCA_PROBE);
if (bt_port_probe(dev, &info) != 0) {
printf("bt_mca_probe: Probe failed for "
@ -197,7 +209,7 @@ bt_mca_attach (device_t dev)
int error = 0;
/* Allocate resources */
if ((error = bt_mca_alloc_resources(dev))) {
if ((error = bt_mca_alloc_resources(dev, BT_MCA_ATTACH))) {
device_printf(dev, "Unable to allocate resources in bt_mca_attach()\n");
return (error);
}

4
sys/dev/mca/mca_bus.c
View File

@ -56,12 +56,12 @@
static void mca_reg_print (device_t, char *, char *, int *);
struct mca_device {
struct resource_list rl; /* Resources */
mca_id_t id;
u_int8_t slot;
u_int8_t enabled;
u_int8_t pos[8]; /* Programable Option Select Regs. */
struct resource_list rl; /* Resources */
};
/* Not supposed to use this function! */