diff options
author | mjacob <mjacob@FreeBSD.org> | 2007-03-12 04:54:30 +0000 |
---|---|---|
committer | mjacob <mjacob@FreeBSD.org> | 2007-03-12 04:54:30 +0000 |
commit | f15b215cc0e1082d6dddf0b28e090bd0a7853247 (patch) | |
tree | e40b3cf47237e494e476d6f3b70631f204fb38fa /sys | |
parent | f85d4141eaf405aace116263c35cd7497a8abb72 (diff) | |
download | FreeBSD-src-f15b215cc0e1082d6dddf0b28e090bd0a7853247.zip FreeBSD-src-f15b215cc0e1082d6dddf0b28e090bd0a7853247.tar.gz |
Fix compilation issues found in RELENG_4 port and merge the
diffs back to -current to keep versions identical.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/isp/isp.c | 16 | ||||
-rw-r--r-- | sys/dev/isp/isp_freebsd.c | 7 | ||||
-rw-r--r-- | sys/dev/isp/isp_freebsd.h | 11 | ||||
-rw-r--r-- | sys/dev/isp/isp_pci.c | 4 |
4 files changed, 27 insertions, 11 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index 0e26153..5fe7682 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -2000,10 +2000,14 @@ isp_fibre_init_2400(ispsoftc_t *isp) icbp->icb_atioqlen); return; } - icbp->icb_atioqaddr[RQRSP_ADDR0015] = DMA_WD0(isp->isp_atioq_dma); - icbp->icb_atioqaddr[RQRSP_ADDR1631] = DMA_WD1(isp->isp_atioq_dma); - icbp->icb_atioqaddr[RQRSP_ADDR3247] = DMA_WD2(isp->isp_atioq_dma); - icbp->icb_atioqaddr[RQRSP_ADDR4863] = DMA_WD3(isp->isp_atioq_dma); + icbp->icb_atioqaddr[RQRSP_ADDR0015] = + DMA_WD0(isp->isp_atioq_dma); + icbp->icb_atioqaddr[RQRSP_ADDR1631] = + DMA_WD1(isp->isp_atioq_dma); + icbp->icb_atioqaddr[RQRSP_ADDR3247] = + DMA_WD2(isp->isp_atioq_dma); + icbp->icb_atioqaddr[RQRSP_ADDR4863] = + DMA_WD3(isp->isp_atioq_dma); isp_prt(isp, ISP_LOGDEBUG0, "isp_fibre_init_2400: atioq %04x%04x%04x%04x", DMA_WD3(isp->isp_atioq_dma), DMA_WD2(isp->isp_atioq_dma), @@ -4803,7 +4807,7 @@ again: isp_prt(isp, ISP_LOGERR, notresp, etype, oop, optr, nlooked); isp_print_bytes(isp, - "Reqeonse Queue Entry", QENTRY_LEN, sp); + "Request Queue Entry", QENTRY_LEN, sp); MEMZERO(hp, QENTRY_LEN); /* PERF */ continue; } @@ -7502,7 +7506,7 @@ isp_rd_2400_nvram(ispsoftc_t *isp, uint32_t addr, uint32_t *rp) { int loops = 0; const uint32_t base = 0x7ffe0000; - uint32_t tmp; + uint32_t tmp = 0; ISP_WRITE(isp, BIU2400_FLASH_ADDR, base | addr); for (loops = 0; loops < 5000; loops++) { diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 14bb5f2..8ec82e2 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -39,6 +39,8 @@ __FBSDID("$FreeBSD$"); #include <dev/isp/isp_ioctl.h> #if __FreeBSD_version >= 500000 #include <sys/sysctl.h> +#else +#include <sys/devicestat.h> #endif #include <cam/cam_periph.h> #include <cam/cam_xpt_periph.h> @@ -2127,10 +2129,7 @@ isp_watchdog(void *arg) } -#if __FreeBSD_version >= 500000 -/* - * Support functions for Found/Lost - */ +#if __FreeBSD_version >= 600000 static void isp_make_here(ispsoftc_t *isp, int tgt) { diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 5aa091b..89cea8e 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -349,6 +349,17 @@ default: \ #define ISP_NODEWWN(isp) FCPARAM(isp)->isp_wwnn_nvram #define ISP_PORTWWN(isp) FCPARAM(isp)->isp_wwpn_nvram + +#if __FreeBSD_version < 500000 +#if _BYTE_ORDER == _LITTLE_ENDIAN +#define bswap16 htobe16 +#define bswap32 htobe32 +#else +#define bswap16 htole16 +#define bswap32 htole32 +#endif +#endif + #if BYTE_ORDER == BIG_ENDIAN #ifdef ISP_SBUS_SUPPORTED #define ISP_IOXPUT_8(isp, s, d) *(d) = s diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index b4d70b4..e0f4b02 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -435,7 +435,6 @@ isp_pci_probe(device_t dev) static void isp_get_generic_options(device_t dev, ispsoftc_t *isp) { - uint64_t wwn; int bitmap, unit; unit = device_get_unit(dev); @@ -508,6 +507,9 @@ isp_get_pci_options(device_t dev, int *m1, int *m2) static void isp_get_specific_options(device_t dev, ispsoftc_t *isp) { + uint64_t wwn; + int bitmap; + int unit = device_get_unit(dev); callout_handle_init(&isp->isp_osinfo.ldt); callout_handle_init(&isp->isp_osinfo.gdt); |