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

1. Revert back to the way the older driver handled XPT_PATH_INQ. This seems to

Browse Source 
fix the problem with device discovery seen by some people.
2. Change to make 3ware CLI/3DM work on amd64.
3. Fix a potential problem that could cause the driver to do strlen(NULL) when
   using older firmware.

Reviewed by:scottl
This commit is contained in:
vkashyap 2005-02-10 18:07:33 +00:00
parent 5ac91dfb2b
commit 53986fb12f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/twa/twa_cam.c
View File

@ -409,9 +409,9 @@ twa_action(struct cam_sim *sim, union ccb *ccb)
twa_dbg_dprint(3, sc, "XPT_PATH_INQ request");
path_inq->version_num = 1;
path_inq->hba_inquiry = PI_WIDE_16;
path_inq->hba_inquiry = 0;
path_inq->target_sprt = 0;
path_inq->hba_misc |= PIM_NOBUSRESET;
path_inq->hba_misc = 0;
path_inq->hba_eng_cnt = 0;
path_inq->max_target = TWA_MAX_UNITS;
path_inq->max_lun = 0;

6
sys/dev/twa/twa_globals.c
View File

@ -137,7 +137,7 @@ struct twa_message twa_aen_table[] = {
{0x00FD, "Handler lockup"},
{0x00FE, "Retrying PCI transfer"},
{0x00FF, "AEN queue is full"},
{0xFFFFFFFF, (char *)NULL}
{0xFFFFFFFF, ""}
};
/* AEN severity table. */
@ -147,7 +147,7 @@ char *twa_aen_severity_table[] = {
"WARNING",
"INFO",
"DEBUG",
(char *)NULL
""
};
/* Error messages. */
@ -307,7 +307,7 @@ struct twa_message twa_error_table[] = {
{0x0330, "Log updates not allowed"},
{0x0331, "Logs are invalid"},
{0x0332, "Logs not found"},
{0xFFFFFFFF, (char *)NULL}
{0xFFFFFFFF, ""}
};
#ifdef TWA_DEBUG

4
sys/dev/twa/twa_ioctl.h
View File

@ -89,7 +89,7 @@ struct twa_driver_packet {
struct twa_ioctl_9k {
struct twa_driver_packet twa_drvr_pkt;
void *pdata; /* points to data_buf */
int8_t padding[484];
int8_t padding[488 - sizeof(void *)];
struct twa_command_packet twa_cmd_pkt;
int8_t data_buf[1];
} __attribute__ ((packed));
@ -106,7 +106,7 @@ struct twa_ioctl_9k {
typedef struct twa_ioctl_no_data_buf {
struct twa_driver_packet twa_drvr_pkt;
void *pdata; /* points to data_buf */
int8_t padding[484];
int8_t padding[488 - sizeof(void *)];
struct twa_command_packet twa_cmd_pkt;
} __attribute__ ((packed)) TWA_IOCTL_NO_DATA_BUF;
#pragma pack()