Commit 1f285f14 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by John W. Linville

rt2x00: move REGISTER_BUSY_* definitions to rt2x00.h

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f4450616
...@@ -856,6 +856,15 @@ struct rt2x00_dev { ...@@ -856,6 +856,15 @@ struct rt2x00_dev {
void *priv; void *priv;
}; };
/*
* Register defines.
* Some registers require multiple attempts before success,
* in those cases REGISTER_BUSY_COUNT attempts should be
* taken with a REGISTER_BUSY_DELAY interval.
*/
#define REGISTER_BUSY_COUNT 5
#define REGISTER_BUSY_DELAY 100
/* /*
* Generic RF access. * Generic RF access.
* The RF is being accessed by word index. * The RF is being accessed by word index.
......
...@@ -34,15 +34,6 @@ ...@@ -34,15 +34,6 @@
*/ */
#define PCI_DEVICE_DATA(__ops) .driver_data = (kernel_ulong_t)(__ops) #define PCI_DEVICE_DATA(__ops) .driver_data = (kernel_ulong_t)(__ops)
/*
* Register defines.
* Some registers require multiple attempts before success,
* in those cases REGISTER_BUSY_COUNT attempts should be
* taken with a REGISTER_BUSY_DELAY interval.
*/
#define REGISTER_BUSY_COUNT 5
#define REGISTER_BUSY_DELAY 100
/* /*
* Register access. * Register access.
*/ */
......
...@@ -39,17 +39,11 @@ ...@@ -39,17 +39,11 @@
#define USB_DEVICE_DATA(__ops) .driver_info = (kernel_ulong_t)(__ops) #define USB_DEVICE_DATA(__ops) .driver_info = (kernel_ulong_t)(__ops)
/* /*
* Register defines.
* Some registers require multiple attempts before success,
* in those cases REGISTER_BUSY_COUNT attempts should be
* taken with a REGISTER_BUSY_DELAY interval.
* For USB vendor requests we need to pass a timeout * For USB vendor requests we need to pass a timeout
* time in ms, for this we use the REGISTER_TIMEOUT, * time in ms, for this we use the REGISTER_TIMEOUT,
* however when loading firmware a higher value is * however when loading firmware a higher value is
* required. In that case we use the REGISTER_TIMEOUT_FIRMWARE. * required. In that case we use the REGISTER_TIMEOUT_FIRMWARE.
*/ */
#define REGISTER_BUSY_COUNT 5
#define REGISTER_BUSY_DELAY 100
#define REGISTER_TIMEOUT 500 #define REGISTER_TIMEOUT 500
#define REGISTER_TIMEOUT_FIRMWARE 1000 #define REGISTER_TIMEOUT_FIRMWARE 1000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment