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

per bde (who is right about this) that an inlined fucntion with const

Browse Source 
char * strings being returned defined in a header file included several
places but only used in one module, is, uh, silly.
This commit is contained in:
Matt Jacob 1998-09-17 23:20:29 +00:00
parent 7ac6b5a314
commit a70ac9fd83
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,7 @@ static void isp_fw_state __P((struct ispsoftc *));
static void isp_dumpregs __P((struct ispsoftc *, const char *));
static void isp_dumpxflist __P((struct ispsoftc *));
static void isp_prtstst __P((ispstatusreq_t *));
static char *isp2100_fw_statename __P((u_int8_t));
static void isp_mboxcmd __P((struct ispsoftc *, mbreg_t *));
static void isp_update __P((struct ispsoftc *));
@ -802,8 +803,9 @@ isp_fibre_init(isp)
for (count = 0; count < 12000; count++) {
isp_fw_state(isp);
if (lwfs != fcp->isp_fwstate) {
PRINTF("%s: Firmware State %s -> %s\n", isp->isp_name,
fw_statename(lwfs), fw_statename(fcp->isp_fwstate));
PRINTF("%s: Firmware State %s -> %s\n",
isp->isp_name, isp2100_fw_statename(lwfs),
isp2100_fw_statename(fcp->isp_fwstate));
lwfs = fcp->isp_fwstate;
}
if (fcp->isp_fwstate == FW_READY) {
@ -2700,6 +2702,9 @@ isp_watch(arg)
RESTART_WATCHDOG(isp_watch, isp);
}
/*
* Miscellaneous debug statements.
*/
static void
isp_prtstst(sp)
ispstatusreq_t *sp;
@ -2740,6 +2745,23 @@ isp_prtstst(sp)
PRINTF("\n");
}
static char *
isp2100_fw_statename(state)
u_int8_t state;
{
switch(state) {
case FW_CONFIG_WAIT: return "Config Wait";
case FW_WAIT_AL_PA: return "Waiting for AL/PA";
case FW_WAIT_LOGIN: return "Wait Login";
case FW_READY: return "Ready";
case FW_LOSS_OF_SYNC: return "Loss Of Sync";
case FW_ERROR: return "Error";
case FW_REINIT: return "Re-Init";
case FW_NON_PART: return "Nonparticipating";
default: return "eh?";
}
}
/*
* NVRAM Routines
*/

20
sys/dev/isp/ispvar.h
View File

@ -1,4 +1,4 @@
/* $Id: ispvar.h,v 1.17 1998/09/14 23:22:51 mjacob Exp $ */
/* $FreeBSD$ */
/*
* Soft Definitions for for Qlogic ISP SCSI adapters.
*
@ -175,24 +175,6 @@ typedef struct {
#define FW_REINIT 0x0006
#define FW_NON_PART 0x0007
static __inline char *fw_statename __P((u_int8_t x));
static __inline char *
fw_statename(x)
u_int8_t x;
{
switch(x) {
case FW_CONFIG_WAIT: return "Config Wait";
case FW_WAIT_AL_PA: return "Waiting for AL/PA";
case FW_WAIT_LOGIN: return "Wait Login";
case FW_READY: return "Ready";
case FW_LOSS_OF_SYNC: return "Loss Of Sync";
case FW_ERROR: return "Error";
case FW_REINIT: return "Re-Init";
case FW_NON_PART: return "Nonparticipating";
default: return "eh?";
}
}
/*
* Soft Structure per host adapter
*/