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

Restore multi-release tradition of the driver.

Browse Source 
Reviewed by:	mjacob
This commit is contained in:
Jung-uk Kim 2008-05-02 17:02:35 +00:00
parent f1675e84a5
commit a41aabe249
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/mpt/mpt.h
View File

@ -270,18 +270,30 @@ void mpt_map_rquest(void *, bus_dma_segment_t *, int, int);
#define mpt_setup_intr bus_setup_intr #define mpt_setup_intr bus_setup_intr
#endif #endif
/* **************************** NewBUS CAM Support ****************************/
#if __FreeBSD_version < 700049
#define mpt_xpt_bus_register(sim, parent, bus) \
xpt_bus_register(sim, bus)
#else
#define mpt_xpt_bus_register xpt_bus_register
#endif
/**************************** Kernel Thread Support ***************************/ /**************************** Kernel Thread Support ***************************/
#if __FreeBSD_version > 500005
#if __FreeBSD_version > 800001 #if __FreeBSD_version > 800001
#define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \ #define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \
kproc_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) kproc_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
#else #define mpt_kthread_exit(status) \
kproc_exit(status)
#elif __FreeBSD_version > 500005
#define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \ #define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \
kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
#endif #define mpt_kthread_exit(status) \
kthread_exit(status)
#else #else
#define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \ #define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \
kthread_create(func, farg, proc_ptr, fmtstr, arg) kthread_create(func, farg, proc_ptr, fmtstr, arg)
#define mpt_kthread_exit(status) \
kthread_exit(status)
#endif #endif
/****************************** Timer Facilities ******************************/ /****************************** Timer Facilities ******************************/

7
sys/dev/mpt/mpt_cam.c
View File

@ -346,7 +346,7 @@ mpt_cam_attach(struct mpt_softc *mpt)
* Register exactly this bus. * Register exactly this bus.
*/ */
MPT_LOCK(mpt); MPT_LOCK(mpt);
if (xpt_bus_register(mpt->sim, mpt->dev, 0) != CAM_SUCCESS) { if (mpt_xpt_bus_register(mpt->sim, mpt->dev, 0) != CAM_SUCCESS) {
mpt_prt(mpt, "Bus registration Failed!\n"); mpt_prt(mpt, "Bus registration Failed!\n");
error = ENOMEM; error = ENOMEM;
MPT_UNLOCK(mpt); MPT_UNLOCK(mpt);
@ -385,7 +385,8 @@ mpt_cam_attach(struct mpt_softc *mpt)
* Register this bus. * Register this bus.
*/ */
MPT_LOCK(mpt); MPT_LOCK(mpt);
if (xpt_bus_register(mpt->phydisk_sim, mpt->dev, 1) != CAM_SUCCESS) { if (mpt_xpt_bus_register(mpt->phydisk_sim, mpt->dev, 1) !=
CAM_SUCCESS) {
mpt_prt(mpt, "Physical Disk Bus registration Failed!\n"); mpt_prt(mpt, "Physical Disk Bus registration Failed!\n");
error = ENOMEM; error = ENOMEM;
MPT_UNLOCK(mpt); MPT_UNLOCK(mpt);
@ -3988,7 +3989,7 @@ mpt_recovery_thread(void *arg)
mpt->recovery_thread = NULL; mpt->recovery_thread = NULL;
wakeup(&mpt->recovery_thread); wakeup(&mpt->recovery_thread);
MPT_UNLOCK(mpt); MPT_UNLOCK(mpt);
kproc_exit(0); mpt_kthread_exit(0);
} }
static int static int

2
sys/dev/mpt/mpt_raid.c
View File

@ -722,7 +722,7 @@ mpt_raid_thread(void *arg)
mpt->raid_thread = NULL; mpt->raid_thread = NULL;
wakeup(&mpt->raid_thread); wakeup(&mpt->raid_thread);
MPT_UNLOCK(mpt); MPT_UNLOCK(mpt);
kproc_exit(0); mpt_kthread_exit(0);
} }
#if 0 #if 0