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

Fix compilation issues found in RELENG_4 port and merge the

Browse Source 
diffs back to -current to keep versions identical.
This commit is contained in:
Matt Jacob 2007-03-12 04:54:30 +00:00
parent 04d56e6287
commit 70273f9064
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/isp/isp.c
View File

@ -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++) {

7
sys/dev/isp/isp_freebsd.c
View File

@ -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)
{

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

@ -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

4
sys/dev/isp/isp_pci.c
View File

@ -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);