mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Get rid of ridiculous ISP_PVS macro. Instead, just set an

Browse Source 
ISP_SMPLOCK define based on the previous 5.4 major/minor release
define of PVS- because this allows us to turn it off easier.
This commit is contained in:
Matt Jacob 2000-10-25 04:42:46 +00:00
parent 3395b0568a
commit 650789cb1b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=67550
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/isp/isp_freebsd.h
View File

@ -30,8 +30,9 @@
#define ISP_PLATFORM_VERSION_MAJOR 5
#define ISP_PLATFORM_VERSION_MINOR 4
#define ISP_PVS \
((ISP_PLATFORM_VERSION_MAJOR * 10) + ISP_PLATFORM_VERSION_MINOR)
#if ((ISP_PLATFORM_VERSION_MAJOR * 10) + ISP_PLATFORM_VERSION_MINOR) >= 54
#define ISP_SMPLOCK 1
#endif
#include <sys/param.h>
@ -100,7 +101,7 @@ struct isposinfo {
u_int8_t simqfrozen;
u_int8_t drain;
u_int8_t intsok;
#if ISP_PVS >= 54
#ifdef ISP_SMPLOCK
struct mtx lock;
#else
volatile u_int32_t islocked;
@ -277,7 +278,7 @@ extern void isp_uninit(struct ispsoftc *);
* Locking macros...
*/
#if ISP_PVS >= 54
#ifdef ISP_SMPLOCK
#define ISP_LOCK(x) mtx_enter(&(x)->isp_osinfo.lock, MTX_DEF)
#define ISP_UNLOCK(x) mtx_exit(&(x)->isp_osinfo.lock, MTX_DEF)
#else
@ -309,7 +310,7 @@ extern void isp_uninit(struct ispsoftc *);
/*
* Platform specific inline functions
*/
#if ISP_PVS < 54
#ifndef ISP_SMPLOCK
static INLINE void isp_lock(struct ispsoftc *);
static INLINE void
isp_lock(struct ispsoftc *isp)
@ -338,7 +339,7 @@ isp_mbox_wait_complete(struct ispsoftc *isp)
{
if (isp->isp_osinfo.intsok) {
isp->isp_osinfo.mboxwaiting = 1;
#if ISP_PVS >= 54
#ifdef ISP_SMPLOCK
(void) msleep(&isp->isp_osinfo.mboxwaiting,
&isp->isp_osinfo.lock, PRIBIO, "isp_mboxwaiting", 5 * hz);
#else