diff options
| author | Vinod Kashyap <vkashyap@FreeBSD.org> | 2005-02-10 18:07:33 +0000 |
|---|---|---|
| committer | Vinod Kashyap <vkashyap@FreeBSD.org> | 2005-02-10 18:07:33 +0000 |
| commit | 6cc7bd94646faa66c6d284da55544b84894d5488 (patch) | |
| tree | 6c7615c8c36f825fa38e0b95dd378ae1b778737d /sys/dev/twa | |
| parent | 26478079f7672914330c279ece18d340361da920 (diff) | |
Notes
Diffstat (limited to 'sys/dev/twa')
| -rw-r--r-- | sys/dev/twa/twa_cam.c | 4 | ||||
| -rw-r--r-- | sys/dev/twa/twa_globals.c | 6 | ||||
| -rw-r--r-- | sys/dev/twa/twa_ioctl.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/twa/twa_cam.c b/sys/dev/twa/twa_cam.c index e79340851594..d384058b9a88 100644 --- a/sys/dev/twa/twa_cam.c +++ b/sys/dev/twa/twa_cam.c @@ -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; diff --git a/sys/dev/twa/twa_globals.c b/sys/dev/twa/twa_globals.c index 71a0437b073e..9fb0a444f81e 100644 --- a/sys/dev/twa/twa_globals.c +++ b/sys/dev/twa/twa_globals.c @@ -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 diff --git a/sys/dev/twa/twa_ioctl.h b/sys/dev/twa/twa_ioctl.h index 80373fe889ec..20b95bb307a2 100644 --- a/sys/dev/twa/twa_ioctl.h +++ b/sys/dev/twa/twa_ioctl.h @@ -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() |