upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build of aha(4).

Browse source 
Submitted by:	delphij
This commit is contained in:
Gleb Smirnoff 2012-10-16 08:40:09 +00:00
parent dd9de3098a
commit 2e8b27a5d3
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/dev/aha/aha.c
View file

@ -61,6 +61,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/bus.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@ -68,6 +69,7 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/rman.h>
#include <machine/bus.h>
@ -173,8 +175,7 @@ static void ahatimeout(void *arg);
/* Exported functions */
void
aha_alloc(struct aha_softc *aha, int unit, bus_space_tag_t tag,
bus_space_handle_t bsh)
aha_alloc(struct aha_softc *aha)
{
SLIST_INIT(&aha->free_aha_ccbs);
@ -1107,7 +1108,7 @@ ahaexecuteccb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
device_printf(aha->dev,
"Encountered busy mailbox with %d out of %d "
"commands active!!!", aha->active_ccbs, aha->max_ccbs);
callout_stop(&aacb->timer);
callout_stop(&accb->timer);
if (nseg != 0)
bus_dmamap_unload(aha->buffer_dmat, accb->dmamap);
ahafreeccb(aha, accb);
@ -1833,7 +1834,7 @@ ahatimeout(void *arg)
* later which will attempt a bus reset.
*/
accb->flags |= ACCB_DEVICE_RESET;
callout_reset(&aacb->timer, 2 * hz, ahatimeout, accb);
callout_reset(&accb->timer, 2 * hz, ahatimeout, accb);
aha->recovery_accb->hccb.opcode = INITIATOR_BUS_DEV_RESET;
/* No Data Transfer */

10
sys/dev/aha/aha_isa.c
View file

@ -126,7 +126,7 @@ aha_isa_probe(device_t dev)
if (aha->port == NULL)
return (ENXIO);
port_start = rman_get_start(port_res);
port_start = rman_get_start(aha->port);
aha_alloc(aha);
/* See if there is really a card present */
@ -321,9 +321,9 @@ aha_isa_identify(driver_t *driver, device_t parent)
* XXX kldload/kldunload.
*/
rid = 0;
aha->port = bus_alloc_resource(parent, SYS_RES_IOPORT, &rid,
aha.port = bus_alloc_resource(parent, SYS_RES_IOPORT, &rid,
ioport, ioport, AHA_NREGS, RF_ACTIVE);
if (aha->port == NULL)
if (aha.port == NULL)
continue;
aha_alloc(&aha);
/* See if there is really a card present */
@ -335,8 +335,8 @@ aha_isa_identify(driver_t *driver, device_t parent)
* Could query the board and set IRQ/DRQ, but probe does
* that.
*/
not_this_one:;
bus_release_resource(parent, SYS_RES_IOPORT, rid, aha->port);
not_this_one:
bus_release_resource(parent, SYS_RES_IOPORT, rid, aha.port);
aha_free(&aha);
}
}

12
sys/dev/aha/ahareg.h
View file

@ -370,12 +370,12 @@ struct aha_softc {
int irqrid;
int portrid;
int drqrid;
void **ih;
void *ih;
device_t dev;
struct mtx lock;
};
void aha_alloc(struct aha_softc *, int, bus_space_tag_t, bus_space_handle_t);
void aha_alloc(struct aha_softc *);
int aha_attach(struct aha_softc *);
int aha_cmd(struct aha_softc *, aha_op_t, uint8_t *, u_int, uint8_t *, u_int,
u_int);
@ -389,11 +389,11 @@ int aha_probe(struct aha_softc *);
#define DEFAULT_CMD_TIMEOUT 10000 /* 1 sec */
#define aha_inb(aha, port) \
bus_read_1((aha)->port, port)
#define aha_inb(aha, reg) \
bus_read_1((aha)->port, reg)
#define aha_outb(aha, port, value) \
bus_write_1((aha)->port, port, value)
#define aha_outb(aha, reg, value) \
bus_write_1((aha)->port, reg, value)
#define ADP0100_PNP 0x00019004 /* ADP0100 */
#define AHA1540_PNP 0x40159004 /* ADP1540 */