* [PATCH 2/32] rt2x00: use enumerations
@ 2006-04-27 22:02 Ivo van Doorn
0 siblings, 0 replies; only message in thread
From: Ivo van Doorn @ 2006-04-27 22:02 UTC (permalink / raw)
To: netdev; +Cc: rt2x00-devel
[-- Attachment #1: Type: text/plain, Size: 3381 bytes --]
From: Ivo van Doorn <IvDoorn@gmail.com>
The led_mode defines are equal in all drivers,
and should be placed in the common rt2x00.h header.
Make the led_mode, tx_status and dev_state defines
into enumerations.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2400pci.h wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2400pci.h
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2400pci.h 2006-04-27 00:52:56.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2400pci.h 2006-04-27 21:25:33.000000000 +0200
@@ -936,11 +936,6 @@ struct rt2x00_pci{
* Led status
*/
u8 led_mode;
-#define LED_MODE_DEFAULT 0
-#define LED_MODE_TXRX_ACTIVITY 1
-#define LED_MODE_SINGLE 2
-#define LED_MODE_ASUS 3
-#define LED_MODE_ALPHA 4
/*
* EEPROM BBP data.
diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2500pci.h wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2500pci.h
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2500pci.h 2006-04-27 00:52:56.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2500pci.h 2006-04-27 21:25:33.000000000 +0200
@@ -1192,11 +1192,6 @@ struct rt2x00_pci{
* Led status
*/
u8 led_mode;
-#define LED_MODE_DEFAULT 0
-#define LED_MODE_TXRX_ACTIVITY 1
-#define LED_MODE_SINGLE 2
-#define LED_MODE_ASUS 3
-#define LED_MODE_ALPHA 4
/*
* EEPROM BBP data.
diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2500usb.h wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2500usb.h
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2500usb.h 2006-04-27 00:52:56.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2500usb.h 2006-04-27 21:25:33.000000000 +0200
@@ -691,11 +691,6 @@ struct rt2x00_usb{
* Led status
*/
u8 led_mode;
-#define LED_MODE_DEFAULT 0
-#define LED_MODE_TXRX_ACTIVITY 1
-#define LED_MODE_SINGLE 2
-#define LED_MODE_ASUS 3
-#define LED_MODE_ALPHA 4
/*
* EEPROM BBP data.
diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2x00.h wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2x00.h
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2x00.h 2006-04-27 21:23:26.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2x00.h 2006-04-27 21:25:33.000000000 +0200
@@ -96,11 +96,34 @@ static int rt2x00_debug_level = 0;
/*
* TX result flags.
*/
-#define TX_SUCCESS 0
-#define TX_SUCCESS_RETRY 1
-#define TX_FAIL_RETRY 2
-#define TX_FAIL_INVALID 3
-#define TX_FAIL_OTHER 4
+enum TX_STATUS {
+ TX_SUCCESS = 0,
+ TX_SUCCESS_RETRY = 1,
+ TX_FAIL_RETRY = 2,
+ TX_FAIL_INVALID = 3,
+ TX_FAIL_OTHER = 4,
+};
+
+/*
+ * Led mode values.
+ */
+enum led_mode {
+ LED_MODE_DEFAULT = 0,
+ LED_MODE_TXRX_ACTIVITY = 1,
+ LED_MODE_SIGNAL_STRENGTH = 2,
+ LED_MODE_ASUS = 3,
+ LED_MODE_ALPHA = 4,
+};
+
+/*
+ * Device states
+ */
+enum dev_state {
+ STATE_DEEP_SLEEP = 0,
+ STATE_SLEEP = 1,
+ STATE_STANDBY = 2,
+ STATE_AWAKE = 3,
+};
/*
* Macros for determining which is the lowest or highest bit
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-04-27 22:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-27 22:02 [PATCH 2/32] rt2x00: use enumerations Ivo van Doorn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).