diff options
| author | emax <emax@FreeBSD.org> | 2005-01-04 20:13:48 +0000 |
|---|---|---|
| committer | emax <emax@FreeBSD.org> | 2005-01-04 20:13:48 +0000 |
| commit | 626c8fa3a1920fb021b8cecebc7ff6e15296c84c (patch) | |
| tree | 3dfb9cc35663c4259d1fbb20f9599092a26abcb1 | |
| parent | adda6707d7ae2c1932359c48f48a980c71217acc (diff) | |
| download | FreeBSD-src-626c8fa3a1920fb021b8cecebc7ff6e15296c84c.zip FreeBSD-src-626c8fa3a1920fb021b8cecebc7ff6e15296c84c.tar.gz | |
Rename 'class' field to 'uclass' in the ng_hci_inquiry_response structure.
class is a reserved word in C++
Submitted by: Markus Brueffer < markus AT brueffer DOT de >
MFC after: 3 days
| -rw-r--r-- | sys/netgraph/bluetooth/include/ng_hci.h | 2 | ||||
| -rw-r--r-- | usr.sbin/bluetooth/hccontrol/link_control.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h index a304d04..1fed759 100644 --- a/sys/netgraph/bluetooth/include/ng_hci.h +++ b/sys/netgraph/bluetooth/include/ng_hci.h @@ -1444,7 +1444,7 @@ typedef struct { u_int8_t page_scan_rep_mode; /* page scan rep. mode */ u_int8_t page_scan_period_mode; /* page scan period mode */ u_int8_t page_scan_mode; /* page scan mode */ - u_int8_t class[NG_HCI_CLASS_SIZE]; /* unit class */ + u_int8_t uclass[NG_HCI_CLASS_SIZE];/* unit class */ u_int16_t clock_offset; /* clock offset */ } __attribute__ ((packed)) ng_hci_inquiry_response; diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c index 7d01f04..1558cc5 100644 --- a/usr.sbin/bluetooth/hccontrol/link_control.c +++ b/usr.sbin/bluetooth/hccontrol/link_control.c @@ -157,7 +157,7 @@ hci_inquiry_response(int n, uint8_t **b) fprintf(stdout, "\tPage Scan Mode: %#02x\n", ir->page_scan_mode); fprintf(stdout, "\tClass: %02x:%02x:%02x\n", - ir->class[2], ir->class[1], ir->class[0]); + ir->uclass[2], ir->uclass[1], ir->uclass[0]); fprintf(stdout, "\tClock offset: %#04x\n", le16toh(ir->clock_offset)); |
