d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retire the last of the FreeBSD 4.x compat code from the mly driver.

Browse Source
This commit is contained in:
Scott Long 2005-08-08 12:23:27 +00:00
parent 64682a68e2
commit 98428b152b
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/mly/mly.c
View File

@ -234,12 +234,10 @@ mly_attach(device_t dev)
mly_initq_busy(sc); mly_initq_busy(sc);
mly_initq_complete(sc); mly_initq_complete(sc);
#if __FreeBSD_version >= 500005
/* /*
* Initialise command-completion task. * Initialise command-completion task.
*/ */
TASK_INIT(&sc->mly_task_complete, 0, mly_complete, sc); TASK_INIT(&sc->mly_task_complete, 0, mly_complete, sc);
#endif
/* disable interrupts before we start talking to the controller */ /* disable interrupts before we start talking to the controller */
MLY_MASK_INTERRUPTS(sc); MLY_MASK_INTERRUPTS(sc);
@ -1605,11 +1603,9 @@ mly_done(struct mly_softc *sc)
splx(s); splx(s);
if (worked) { if (worked) {
#if __FreeBSD_version >= 500005
if (sc->mly_state & MLY_STATE_INTERRUPTS_ON) if (sc->mly_state & MLY_STATE_INTERRUPTS_ON)
taskqueue_enqueue(taskqueue_swi_giant, &sc->mly_task_complete); taskqueue_enqueue(taskqueue_swi_giant, &sc->mly_task_complete);
else else
#endif
mly_complete(sc, 0); mly_complete(sc, 0);
} }
} }

12
sys/dev/mly/mlyvar.h
View File

@ -57,15 +57,7 @@
******************************************************************************** ********************************************************************************
********************************************************************************/ ********************************************************************************/
#if __FreeBSD_version >= 500005
# include <sys/taskqueue.h> # include <sys/taskqueue.h>
#endif
#if __FreeBSD_version <= 500014
# include <machine/clock.h>
# undef offsetof
# define offsetof(type, field) ((size_t)(&((type *)0)->field))
#endif
#ifndef INTR_ENTROPY #ifndef INTR_ENTROPY
# define INTR_ENTROPY 0 # define INTR_ENTROPY 0
@ -234,10 +226,8 @@ struct mly_softc {
struct cam_path *mly_cam_path; /* rescan path */ struct cam_path *mly_cam_path; /* rescan path */
int mly_cam_channels; /* total channel count */ int mly_cam_channels; /* total channel count */
#if __FreeBSD_version >= 500005
/* command-completion task */ /* command-completion task */
struct task mly_task_complete; /* deferred-completion task */ struct task mly_task_complete; /* deferred-completion task */
#endif
int mly_qfrzn_cnt; /* Track simq freezes */ int mly_qfrzn_cnt; /* Track simq freezes */
}; };