OSDN Git Service

lib: Change field name from class_of_dev to dev_class
authorMarcel Holtmann <marcel@holtmann.org>
Sun, 15 Mar 2015 02:10:25 +0000 (19:10 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Sun, 15 Mar 2015 02:10:25 +0000 (19:10 -0700)
lib/mgmt.h
monitor/control.c
tools/btmgmt.c

index 4f81ccf..a72ebca 100644 (file)
@@ -495,7 +495,7 @@ struct mgmt_ev_controller_error {
 
 #define MGMT_EV_CLASS_OF_DEV_CHANGED   0x0007
 struct mgmt_ev_class_of_dev_changed {
-       uint8_t class_of_dev[3];
+       uint8_t dev_class[3];
 } __packed;
 
 #define MGMT_EV_LOCAL_NAME_CHANGED     0x0008
index f2698fb..38a1b31 100644 (file)
@@ -231,9 +231,9 @@ static void mgmt_class_of_dev_changed(uint16_t len, const void *buf)
        }
 
        printf("@ Class of Device Changed: 0x%2.2x%2.2x%2.2x\n",
-                                               ev->class_of_dev[2],
-                                               ev->class_of_dev[1],
-                                               ev->class_of_dev[0]);
+                                               ev->dev_class[2],
+                                               ev->dev_class[1],
+                                               ev->dev_class[0]);
 
        buf += sizeof(*ev);
        len -= sizeof(*ev);
index a4d5088..eda3b45 100644 (file)
@@ -1686,7 +1686,7 @@ static void class_rsp(uint16_t op, uint16_t id, uint8_t status, uint16_t len,
        }
 
        print("%s succeeded. Class 0x%02x%02x%02x", mgmt_opstr(op),
-               rp->class_of_dev[2], rp->class_of_dev[1], rp->class_of_dev[0]);
+               rp->dev_class[2], rp->dev_class[1], rp->dev_class[0]);
 
        noninteractive_quit(EXIT_SUCCESS);
 }