Changeset d2fac08c in mainline
- Timestamp:
- 2011-07-02T21:07:08Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 336d2f52
- Parents:
- 7b2c17c
- Location:
- uspace
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbmast/inquiry.c
r7b2c17c rd2fac08c 49 49 #define BITS_GET_MID_MASK(type, bitcount, offset) \ 50 50 ((type)( BITS_GET_MASK(type, (bitcount) + (offset)) - BITS_GET_MASK(type, bitcount) )) 51 #define BITS_GET(type, number, bitcount, offset) \52 ((type)( (number) & (BITS_GET_MID_MASK(type, bitcount, offset)) ) >> (offset))51 #define BITS_GET(type, number, hi_bit, lo_bit) \ 52 ((type)( (number) & (BITS_GET_MID_MASK(type, (hi_bit)-(lo_bit)+1, lo_bit)) ) >> (lo_bit)) 53 53 54 54 /** Get string representation for SCSI peripheral device type. … … 120 120 bzero(inquiry_result, sizeof(*inquiry_result)); 121 121 122 inquiry_result->device_type = 123 BITS_GET(uint8_t, inq_data.pqual_devtype, 5, 0); 124 inquiry_result->removable = 125 BITS_GET(uint8_t, inq_data.rmb, 1, 7); 122 inquiry_result->device_type = BITS_GET(uint8_t, inq_data.pqual_devtype, 123 SCSI_PQDT_DEV_TYPE_h, SCSI_PQDT_DEV_TYPE_l); 126 124 127 str_ncpy(inquiry_result->vendor, 9, 128 (const char *) &inq_data.vendor, 8); 125 inquiry_result->removable = BITS_GET(uint8_t, inq_data.rmb, 126 SCSI_RMB_RMB, SCSI_RMB_RMB); 127 128 str_ncpy(inquiry_result->vendor, 1 + sizeof(inq_data.vendor), 129 (const char *) &inq_data.vendor, sizeof(inq_data.vendor)); 129 130 trim_trailing_spaces(inquiry_result->vendor); 130 131 131 str_ncpy(inquiry_result->product, 1 7,132 (const char *) &inq_data.product, 16);132 str_ncpy(inquiry_result->product, 1 + sizeof(inq_data.product), 133 (const char *) &inq_data.product, sizeof(inq_data.product)); 133 134 trim_trailing_spaces(inquiry_result->product); 134 135 135 str_ncpy(inquiry_result->revision, 5,136 (const char *) &inq_data.revision, 4);136 str_ncpy(inquiry_result->revision, 1 + sizeof(inq_data.revision), 137 (const char *) &inq_data.revision, sizeof(inq_data.revision)); 137 138 trim_trailing_spaces(inquiry_result->revision); 138 139 -
uspace/lib/scsi/include/scsi/spc.h
r7b2c17c rd2fac08c 93 93 } scsi_std_inquiry_data_t; 94 94 95 /** Bits in scsi_std_inquiry_data_t.pqual_devtype */ 96 enum scsi_pqual_devtype_bits { 97 /* Peripheral qualifier */ 98 SCSI_PQDT_PQUAL_h = 7, 99 SCSI_PQDT_PQUAL_l = 5, 100 101 /* Peripheral device type */ 102 SCSI_PQDT_DEV_TYPE_h = 4, 103 SCSI_PQDT_DEV_TYPE_l = 0 104 }; 105 106 /** Bits in scsi_std_inquiry_data_t.rmb */ 107 enum scsi_rmb_bits { 108 SCSI_RMB_RMB = 7 109 }; 110 95 111 /** SCSI peripheral device type */ 96 112 enum scsi_device_type {
Note:
See TracChangeset
for help on using the changeset viewer.