diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-01-01 10:10:21 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-01-01 10:10:21 +0000 |
| commit | 6a0b40f2f5da3773add753a44d9b8f9a99682b72 (patch) | |
| tree | bea2d274ba2f15878f418f16939baace40b6b4da | |
| parent | 384579e375b7d8d7e16e735ec996e778068784bf (diff) | |
More constant naming for some defines.
| -rw-r--r-- | sys/dev/usb/if_upgt.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/if_upgtvar.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index 06d919451dc..053c9619b55 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.9 2008/01/01 10:03:44 mglocker Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.10 2008/01/01 10:10:20 mglocker Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -1464,7 +1464,7 @@ upgt_tx_task(void *arg) /* XXX differ between data and mgmt frames? */ txdesc->header1.flags = UPGT_H1_FLAGS_TX_DATA; - txdesc->header1.type = UPGT_H1_TYPE_DATA_TX; + txdesc->header1.type = UPGT_H1_TYPE_TX_DATA; txdesc->header1.len = htole16(m->m_pkthdr.len); txdesc->header2.reqid = htole32(data_tx->addr); @@ -1618,8 +1618,8 @@ upgt_rx_cb(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) upgt_tx_done(sc, data_rx->buf); } else - if (h1_type == UPGT_H1_TYPE_DATA_RX || - h1_type == UPGT_H1_TYPE_DATA_RX_MGMT) { + if (h1_type == UPGT_H1_TYPE_RX_DATA || + h1_type == UPGT_H1_TYPE_RX_DATA_MGMT) { DPRINTF(3, "%s: received 802.11 RX data\n", sc->sc_dev.dv_xname); diff --git a/sys/dev/usb/if_upgtvar.h b/sys/dev/usb/if_upgtvar.h index de837b62c7a..2098d936484 100644 --- a/sys/dev/usb/if_upgtvar.h +++ b/sys/dev/usb/if_upgtvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgtvar.h,v 1.3 2008/01/01 10:03:44 mglocker Exp $ */ +/* $OpenBSD: if_upgtvar.h,v 1.4 2008/01/01 10:10:20 mglocker Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -196,9 +196,9 @@ struct upgt_eeprom_freq4_2 { #define UPGT_H1_FLAGS_TX_MGMT 0x00 /* for TX: mgmt frame */ #define UPGT_H1_FLAGS_TX_NO_CALLBACK 0x01 /* for TX: no USB callback */ #define UPGT_H1_FLAGS_TX_DATA 0x10 /* for TX: data frame */ -#define UPGT_H1_TYPE_DATA_RX 0x00 /* 802.11 RX data frame */ -#define UPGT_H1_TYPE_DATA_RX_MGMT 0x01 /* 802.11 RX mgmt frame */ -#define UPGT_H1_TYPE_DATA_TX 0x40 /* 802.11 TX data frame */ +#define UPGT_H1_TYPE_RX_DATA 0x00 /* 802.11 RX data frame */ +#define UPGT_H1_TYPE_RX_DATA_MGMT 0x01 /* 802.11 RX mgmt frame */ +#define UPGT_H1_TYPE_TX_DATA 0x40 /* 802.11 TX data frame */ #define UPGT_H1_TYPE_CTRL 0x80 /* control frame */ struct upgt_lmac_h1 { /* 4 bytes */ |