diff options
| author | Scott Long <scottl@FreeBSD.org> | 2013-09-25 17:16:21 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2013-09-25 17:16:21 +0000 |
| commit | eb8a7632ba2a674b697cfedeba54ccb941a446b9 (patch) | |
| tree | ebaa28f9cc2c11e9c0022f0db7fff2cc3e92b88c /sys/dev/hptmv | |
| parent | f564de00f794fb33bf22a8c4fba818a8bee8a71e (diff) | |
| download | src-eb8a7632ba2a674b697cfedeba54ccb941a446b9.tar.gz src-eb8a7632ba2a674b697cfedeba54ccb941a446b9.zip | |
Re-do r255853. Along with adding back the API/ABI changes from the
original, this hides the contents of cam_compat.h from ktrace/kdump/truss,
avoiding problems there. There are no user-servicable parts in there, so
no need for those tools to be groping around in there.
Approved by: re
Notes
Notes:
svn path=/head/; revision=255871
Diffstat (limited to 'sys/dev/hptmv')
| -rw-r--r-- | sys/dev/hptmv/entry.c | 5 | ||||
| -rw-r--r-- | sys/dev/hptmv/osbsd.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c index 80f513036a2b..85d658e16adb 100644 --- a/sys/dev/hptmv/entry.c +++ b/sys/dev/hptmv/entry.c @@ -1438,6 +1438,7 @@ unregister: free(pAdapter->pbus_dmamap, M_DEVBUF); goto unregister; } + callout_handle_init(&pmap->timeout_ch); } /* setup PRD Tables */ KdPrint(("Allocate PRD Tables\n")); @@ -2758,7 +2759,7 @@ hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs, int error) } } - ccb->ccb_h.timeout_ch = timeout(hpt_timeout, (caddr_t)ccb, 20*hz); + pmap->timeout_ch = timeout(hpt_timeout, (caddr_t)ccb, 20*hz); pVDev->pfnSendCommand(_VBUS_P pCmd); CheckPendingCall(_VBUS_P0); } @@ -2980,7 +2981,7 @@ fOsCommandDone(_VBUS_ARG PCommand pCmd) KdPrint(("fOsCommandDone(pcmd=%p, result=%d)\n", pCmd, pCmd->Result)); - untimeout(hpt_timeout, (caddr_t)ccb, ccb->ccb_h.timeout_ch); + untimeout(hpt_timeout, (caddr_t)ccb, pmap->timeout_ch); switch(pCmd->Result) { case RETURN_SUCCESS: diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h index e71e3edfe3f8..a0232e52efd7 100644 --- a/sys/dev/hptmv/osbsd.h +++ b/sys/dev/hptmv/osbsd.h @@ -153,6 +153,7 @@ typedef struct _BUS_DMAMAP { struct _BUS_DMAMAP *next; struct IALAdapter *pAdapter; bus_dmamap_t dma_map; + struct callout_handle timeout_ch; SCAT_GATH psg[MAX_SG_DESCRIPTORS]; } BUS_DMAMAP, *PBUS_DMAMAP; |