Changeset 64e6945d in mainline

Timestamp:

2011-07-03T10:27:37Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ec62681

Parents:

dcb74c0a

Message:

Factor out bit operations from usbmast to bitops.h.

Location:

uspace

Files:

• drv/bus/usb/usbmast/inquiry.c (modified) (3 diffs)
• lib/c/include/bitops.h (modified) (1 diff)

uspace/drv/bus/usb/usbmast/inquiry.c

@@ -34 +34 @@
  * Main routines of USB mass storage driver.
  */
+#include <bitops.h>
 #include <usb/dev/driver.h>
 #include <usb/debug.h>
@@ -45 +46 @@
 #include "cmds.h"
 #include "mast.h"
-
-#define BITS_GET_MASK(type, bitcount) (((type)(1 << (bitcount)))-1)
-#define BITS_GET_MID_MASK(type, bitcount, offset) \
-        ((type)( BITS_GET_MASK(type, (bitcount) + (offset)) - BITS_GET_MASK(type, bitcount) ))
-#define BITS_GET(type, number, hi_bit, lo_bit) \
-        ((type)( (number) & (BITS_GET_MID_MASK(type, (hi_bit)-(lo_bit)+1, lo_bit)) ) >> (lo_bit))
 
 /** Get string representation for SCSI peripheral device type.
@@ -107 +102 @@
         bzero(inquiry_result, sizeof(*inquiry_result));
 
-        inquiry_result->device_type = BITS_GET(uint8_t, inq_data.pqual_devtype,
-            SCSI_PQDT_DEV_TYPE_h, SCSI_PQDT_DEV_TYPE_l);
+        inquiry_result->device_type = BIT_RANGE_EXTRACT(uint8_t,
+            inq_data.pqual_devtype, SCSI_PQDT_DEV_TYPE_h, SCSI_PQDT_DEV_TYPE_l);
 
-        inquiry_result->removable = BITS_GET(uint8_t, inq_data.rmb,
-            SCSI_RMB_RMB, SCSI_RMB_RMB);
+        inquiry_result->removable = BIT_RANGE_EXTRACT(uint8_t,
+            inq_data.rmb, SCSI_RMB_RMB, SCSI_RMB_RMB);
 
         spascii_to_str(inquiry_result->vendor, SCSI_INQ_VENDOR_STR_BUFSIZE,

uspace/lib/c/include/bitops.h

@@ -38 +38 @@
 #include <sys/types.h>
 
+/** Mask with bit @a n set. */
+#define BIT_V(type, n) \
+    ((type)1 << ((n) - 1))
+
+/** Mask with rightmost @a n bits set. */
+#define BIT_RRANGE(type, n) \
+    (BIT_V(type, (n) + 1) - 1)
+
+/** Mask with bits @a hi .. @a lo set. @a hi >= @a lo. */
+#define BIT_RANGE(type, hi, lo) \
+    (BIT_RRANGE(type, (hi) - (lo) + 1) << (lo))
+
+/** Extract range of bits @a hi .. @a lo from @a value. */
+#define BIT_RANGE_EXTRACT(type, hi, lo, value) \
+    (((value) >> (lo)) & BIT_RRANGE(type, (hi) - (lo) + 1))
 
 /** Return position of first non-zero bit from left (i.e. [log_2(arg)]).