Module Name: src
Committed By: kiyohara
Date: Thu Apr 29 06:51:26 UTC 2010
Modified Files:
src/sys/dev/ieee1394: sbp.c sbp.h
Log Message:
+ Use structs scsipi_inquiry_data/scsi_sense_data instead of scsi3_inquiry_data/
scsi3_sense_data.
+ s/switch()/switch ()/.
+ Change args for printf(). ("FUNCNAME ...") -> ("%s ...\n", __func__, ...)
+ Indent.
+ Remove unnecessary cast.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ieee1394/sbp.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ieee1394/sbp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ieee1394/sbp.c
diff -u src/sys/dev/ieee1394/sbp.c:1.29 src/sys/dev/ieee1394/sbp.c:1.30
--- src/sys/dev/ieee1394/sbp.c:1.29 Mon Mar 29 03:05:28 2010
+++ src/sys/dev/ieee1394/sbp.c Thu Apr 29 06:51:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sbp.c,v 1.29 2010/03/29 03:05:28 kiyohara Exp $ */
+/* $NetBSD: sbp.c,v 1.30 2010/04/29 06:51:26 kiyohara Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.29 2010/03/29 03:05:28 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.30 2010/04/29 06:51:26 kiyohara Exp $");
#include <sys/param.h>
@@ -92,10 +92,10 @@
* 48-64(16): bus_id, node_id
*/
#define SBP_BIND_HI 0x1
-#define SBP_DEV2ADDR(u, l) \
- (((u_int64_t)SBP_BIND_HI << 32) \
- | (((u) & 0x3fff) << 10) \
- | (((l) & 0xff) << 2))
+#define SBP_DEV2ADDR(u, l) \
+ (((uint64_t)SBP_BIND_HI << 32) |\
+ (((u) & 0x3fff) << 10) |\
+ (((l) & 0xff) << 2))
#define SBP_ADDR2UNIT(a) (((a) >> 10) & 0x3fff)
#define SBP_ADDR2LUN(a) (((a) >> 2) & 0xff)
#define SBP_INITIATOR 7
@@ -937,7 +937,7 @@
int i;
SBP_DEBUG(1)
- printf("sbp_probe_target %d\n", target->target_id);
+ printf("%s %d\n", __func__, target->target_id);
END_DEBUG
sbp_alloc_lun(target);
@@ -1484,7 +1484,7 @@
ocb->flags = OCB_ACT_MGM;
ocb->sdev = sdev;
- memset((void *)ocb->orb, 0, sizeof(ocb->orb));
+ memset(ocb->orb, 0, sizeof(ocb->orb));
ocb->orb[6] = htonl((nid << 16) | SBP_BIND_HI);
ocb->orb[7] = htonl(SBP_DEV2ADDR(dv_unit, sdev->lun_id));
@@ -1579,8 +1579,7 @@
sbp_scsi_status(struct sbp_status *sbp_status, struct sbp_ocb *ocb)
{
struct sbp_cmd_status *sbp_cmd_status;
- scsi3_sense_data_t sense =
- (scsi3_sense_data_t)&ocb->xs->sense.scsi_sense;
+ struct scsi_sense_data *sense = &ocb->xs->sense.scsi_sense;
sbp_cmd_status = (struct sbp_cmd_status *)sbp_status->data;
@@ -1608,7 +1607,7 @@
else
sense->response_code = SSD_RCODE_DEFERRED;
if (sbp_cmd_status->valid)
- sense->response_code |= SSD_RESPONSE_CODE_VALID;
+ sense->response_code |= SSD_RCODE_VALID;
sense->flags = sbp_cmd_status->s_key;
if (sbp_cmd_status->mark)
sense->flags |= SSD_FILEMARK;
@@ -1617,25 +1616,25 @@
if (sbp_cmd_status->ill_len)
sense->flags |= SSD_ILI;
- memcpy(sense->information, &sbp_cmd_status->info, 4);
+ memcpy(sense->info, &sbp_cmd_status->info, 4);
if (sbp_status->len <= 1)
/* XXX not scsi status. shouldn't be happened */
- sense->asl = 0;
+ sense->extra_len = 0;
else if (sbp_status->len <= 4)
/* add_sense_code(_qual), info, cmd_spec_info */
- sense->asl = 6;
+ sense->extra_len = 6;
else
/* fru, sense_key_spec */
- sense->asl = 10;
+ sense->extra_len = 10;
memcpy(sense->csi, &sbp_cmd_status->cdb, 4);
sense->asc = sbp_cmd_status->s_code;
sense->ascq = sbp_cmd_status->s_qlfr;
- sense->fruc = sbp_cmd_status->fru;
+ sense->fru = sbp_cmd_status->fru;
- memcpy(sense->sks, sbp_cmd_status->s_keydep, 3);
+ memcpy(sense->sks.sks_bytes, sbp_cmd_status->s_keydep, 3);
ocb->xs->error = XS_SENSE;
ocb->xs->xs_status = sbp_cmd_status->status;
/*
@@ -1663,7 +1662,8 @@
{
struct scsipi_xfer *xs = ocb->xs;
struct sbp_dev *sdev;
- scsi3_inquiry_data_t inq = (scsi3_inquiry_data_t)xs->data;
+ struct scsipi_inquiry_data *inq =
+ (struct scsipi_inquiry_data *)xs->data;
sdev = ocb->sdev;
@@ -1709,9 +1709,9 @@
* XXX CAM also checks SCP_QUEUE_DQUE flag in the control mode page.
*/
if (sbp_tags > 0)
- inq->flags[1] |= SID_CmdQue;
+ inq->flags3 |= SID_CmdQue;
else if (sbp_tags < 0)
- inq->flags[1] &= ~SID_CmdQue;
+ inq->flags3 &= ~SID_CmdQue;
}
@@ -1818,7 +1818,7 @@
END_DEBUG
printf("%s:%s\n", device_xname(sc->sc_fd.dev), sdev->bustgtlun);
status = sbp_status->status;
- switch(sbp_status->resp) {
+ switch (sbp_status->resp) {
case SBP_REQ_CMP:
if (status > MAX_ORB_STATUS0)
printf("%s\n", orb_status0[MAX_ORB_STATUS0]);
@@ -1853,17 +1853,17 @@
if (ocb == NULL)
goto done;
- switch(ntohl(ocb->orb[4]) & ORB_FMT_MSK) {
+ switch (ntohl(ocb->orb[4]) & ORB_FMT_MSK) {
case ORB_FMT_NOP:
break;
case ORB_FMT_VED:
break;
case ORB_FMT_STD:
- switch(ocb->flags) {
+ switch (ocb->flags) {
case OCB_ACT_MGM:
orb_fun = ntohl(ocb->orb[4]) & ORB_FUN_MSK;
reset_agent = 0;
- switch(orb_fun) {
+ switch (orb_fun) {
case ORB_FUN_LGI:
{
const struct fwdma_alloc *dma = &sdev->dma;
@@ -2152,7 +2152,7 @@
if (method == 2)
tsdev->status = SBP_DEV_LOGIN;
}
- switch(method) {
+ switch (method) {
case 1:
aprint_error("target reset\n");
sbp_mgm_orb(sdev, ORB_FUN_RST, NULL);
@@ -2197,7 +2197,7 @@
__func__, sdev->bustgtlun, (uint32_t)ocb->bus_addr);
sdev->timeout++;
- switch(sdev->timeout) {
+ switch (sdev->timeout) {
case 1:
aprint_error("agent reset\n");
if (sdev->periph != NULL) {
Index: src/sys/dev/ieee1394/sbp.h
diff -u src/sys/dev/ieee1394/sbp.h:1.4 src/sys/dev/ieee1394/sbp.h:1.5
--- src/sys/dev/ieee1394/sbp.h:1.4 Mon Mar 29 03:05:28 2010
+++ src/sys/dev/ieee1394/sbp.h Thu Apr 29 06:51:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sbp.h,v 1.4 2010/03/29 03:05:28 kiyohara Exp $ */
+/* $NetBSD: sbp.h,v 1.5 2010/04/29 06:51:26 kiyohara Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -200,36 +200,4 @@
/* E */ "LOGICAL UNIT RESET", \
/* F */ "TARGET RESET"
-
-struct scsi3_inquiry_data {
- uint8_t device;
- uint8_t reserved0;
- uint8_t version;
- uint8_t rdf; /* Response data format */
- uint8_t additional_length;
- uint8_t reserved1;
- uint8_t flags[2];
- char vendor[8];
- char product[16];
- char revision[4];
- u_int8_t vendor_specific[20];
-};
-typedef struct scsi3_inquiry_data *scsi3_inquiry_data_t;
-
-struct scsi3_sense_data {
- uint8_t response_code;
-#define SSD_RESPONSE_CODE_VALID 0x80
- uint8_t segment_number;
- uint8_t flags;
- uint8_t information[4];
- uint8_t asl; /* Additional sense length */
- uint8_t csi[4]; /* Command-specific information */
- uint8_t asc; /* Additional sense code */
- uint8_t ascq; /* Additional sense code qualifier */
- uint8_t fruc; /* Field replaceable unit code */
- uint8_t sks[3]; /* Sense-key specific */
- uint8_t asb[14]; /* Additional sense bytes */
-};
-typedef struct scsi3_sense_data *scsi3_sense_data_t;
-
#endif /* _SBP_H_ */
