diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-12-11 15:23:14 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:14 -0500 |
commit | 52b81c89e564cdde8f2b4ccd0e314f04f8f23ab9 (patch) | |
tree | a748b608d37aed19749ab3b815b03e4806fed561 /drivers/staging/rt2860/rt_linux.h | |
parent | 0f65bec15b2184dcf98dbdbf03187057de842eb5 (diff) |
Staging: rt28x0: run *.h files through Lindent
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/rt_linux.h')
-rw-r--r-- | drivers/staging/rt2860/rt_linux.h | 155 |
1 files changed, 61 insertions, 94 deletions
diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h index d16bcf3bbd3..478c8d0d6e9 100644 --- a/drivers/staging/rt2860/rt_linux.h +++ b/drivers/staging/rt2860/rt_linux.h | |||
@@ -79,7 +79,6 @@ | |||
79 | * Profile related sections | 79 | * Profile related sections |
80 | ***********************************************************************************/ | 80 | ***********************************************************************************/ |
81 | 81 | ||
82 | |||
83 | #ifdef RTMP_MAC_PCI | 82 | #ifdef RTMP_MAC_PCI |
84 | #define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" | 83 | #define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" |
85 | #define STA_DRIVER_VERSION "2.1.0.0" | 84 | #define STA_DRIVER_VERSION "2.1.0.0" |
@@ -90,8 +89,7 @@ | |||
90 | // RT3070 version: 2.1.1.0 | 89 | // RT3070 version: 2.1.1.0 |
91 | #endif // RTMP_MAC_USB // | 90 | #endif // RTMP_MAC_USB // |
92 | 91 | ||
93 | extern const struct iw_handler_def rt28xx_iw_handler_def; | 92 | extern const struct iw_handler_def rt28xx_iw_handler_def; |
94 | |||
95 | 93 | ||
96 | /*********************************************************************************** | 94 | /*********************************************************************************** |
97 | * Compiler related definitions | 95 | * Compiler related definitions |
@@ -103,23 +101,23 @@ extern const struct iw_handler_def rt28xx_iw_handler_def; | |||
103 | #define INOUT | 101 | #define INOUT |
104 | #define NDIS_STATUS INT | 102 | #define NDIS_STATUS INT |
105 | 103 | ||
106 | |||
107 | /*********************************************************************************** | 104 | /*********************************************************************************** |
108 | * OS Specific definitions and data structures | 105 | * OS Specific definitions and data structures |
109 | ***********************************************************************************/ | 106 | ***********************************************************************************/ |
110 | typedef struct pci_dev * PPCI_DEV; | 107 | typedef struct pci_dev *PPCI_DEV; |
111 | typedef struct net_device * PNET_DEV; | 108 | typedef struct net_device *PNET_DEV; |
112 | typedef void * PNDIS_PACKET; | 109 | typedef void *PNDIS_PACKET; |
113 | typedef char NDIS_PACKET; | 110 | typedef char NDIS_PACKET; |
114 | typedef PNDIS_PACKET * PPNDIS_PACKET; | 111 | typedef PNDIS_PACKET *PPNDIS_PACKET; |
115 | typedef dma_addr_t NDIS_PHYSICAL_ADDRESS; | 112 | typedef dma_addr_t NDIS_PHYSICAL_ADDRESS; |
116 | typedef dma_addr_t * PNDIS_PHYSICAL_ADDRESS; | 113 | typedef dma_addr_t *PNDIS_PHYSICAL_ADDRESS; |
117 | typedef void * NDIS_HANDLE; | 114 | typedef void *NDIS_HANDLE; |
118 | typedef char * PNDIS_BUFFER; | 115 | typedef char *PNDIS_BUFFER; |
119 | typedef struct pid * RTMP_OS_PID; | 116 | typedef struct pid *RTMP_OS_PID; |
120 | typedef struct semaphore RTMP_OS_SEM; | 117 | typedef struct semaphore RTMP_OS_SEM; |
121 | 118 | ||
122 | typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_dev); | 119 | typedef int (*HARD_START_XMIT_FUNC) (struct sk_buff * skb, |
120 | struct net_device * net_dev); | ||
123 | 121 | ||
124 | #ifdef RTMP_MAC_PCI | 122 | #ifdef RTMP_MAC_PCI |
125 | #ifndef PCI_DEVICE | 123 | #ifndef PCI_DEVICE |
@@ -142,11 +140,8 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_ | |||
142 | #define RTMP_DEC_REF(_A) 0 | 140 | #define RTMP_DEC_REF(_A) 0 |
143 | #define RTMP_GET_REF(_A) 0 | 141 | #define RTMP_GET_REF(_A) 0 |
144 | 142 | ||
145 | |||
146 | // This function will be called when query /proc | 143 | // This function will be called when query /proc |
147 | struct iw_statistics *rt28xx_get_wireless_stats( | 144 | struct iw_statistics *rt28xx_get_wireless_stats(IN struct net_device *net_dev); |
148 | IN struct net_device *net_dev); | ||
149 | |||
150 | 145 | ||
151 | /*********************************************************************************** | 146 | /*********************************************************************************** |
152 | * Network related constant definitions | 147 | * Network related constant definitions |
@@ -178,18 +173,16 @@ struct iw_statistics *rt28xx_get_wireless_stats( | |||
178 | #define STATS_INC_RX_DROPPED(_pAd, _dev) | 173 | #define STATS_INC_RX_DROPPED(_pAd, _dev) |
179 | #define STATS_INC_TX_DROPPED(_pAd, _dev) | 174 | #define STATS_INC_TX_DROPPED(_pAd, _dev) |
180 | 175 | ||
181 | |||
182 | /*********************************************************************************** | 176 | /*********************************************************************************** |
183 | * Ralink Specific network related constant definitions | 177 | * Ralink Specific network related constant definitions |
184 | ***********************************************************************************/ | 178 | ***********************************************************************************/ |
185 | #define MIN_NET_DEVICE_FOR_AID 0x00 //0x00~0x3f | 179 | #define MIN_NET_DEVICE_FOR_AID 0x00 //0x00~0x3f |
186 | #define MIN_NET_DEVICE_FOR_MBSSID 0x00 //0x00,0x10,0x20,0x30 | 180 | #define MIN_NET_DEVICE_FOR_MBSSID 0x00 //0x00,0x10,0x20,0x30 |
187 | #define MIN_NET_DEVICE_FOR_WDS 0x10 //0x40,0x50,0x60,0x70 | 181 | #define MIN_NET_DEVICE_FOR_WDS 0x10 //0x40,0x50,0x60,0x70 |
188 | #define MIN_NET_DEVICE_FOR_APCLI 0x20 | 182 | #define MIN_NET_DEVICE_FOR_APCLI 0x20 |
189 | #define MIN_NET_DEVICE_FOR_MESH 0x30 | 183 | #define MIN_NET_DEVICE_FOR_MESH 0x30 |
190 | #define MIN_NET_DEVICE_FOR_DLS 0x40 | 184 | #define MIN_NET_DEVICE_FOR_DLS 0x40 |
191 | #define NET_DEVICE_REAL_IDX_MASK 0x0f // for each operation mode, we maximum support 15 entities. | 185 | #define NET_DEVICE_REAL_IDX_MASK 0x0f // for each operation mode, we maximum support 15 entities. |
192 | |||
193 | 186 | ||
194 | #define NDIS_PACKET_TYPE_DIRECTED 0 | 187 | #define NDIS_PACKET_TYPE_DIRECTED 0 |
195 | #define NDIS_PACKET_TYPE_MULTICAST 1 | 188 | #define NDIS_PACKET_TYPE_MULTICAST 1 |
@@ -197,36 +190,32 @@ struct iw_statistics *rt28xx_get_wireless_stats( | |||
197 | #define NDIS_PACKET_TYPE_ALL_MULTICAST 3 | 190 | #define NDIS_PACKET_TYPE_ALL_MULTICAST 3 |
198 | #define NDIS_PACKET_TYPE_PROMISCUOUS 4 | 191 | #define NDIS_PACKET_TYPE_PROMISCUOUS 4 |
199 | 192 | ||
200 | |||
201 | /*********************************************************************************** | 193 | /*********************************************************************************** |
202 | * OS signaling related constant definitions | 194 | * OS signaling related constant definitions |
203 | ***********************************************************************************/ | 195 | ***********************************************************************************/ |
204 | 196 | ||
205 | |||
206 | /*********************************************************************************** | 197 | /*********************************************************************************** |
207 | * OS file operation related data structure definitions | 198 | * OS file operation related data structure definitions |
208 | ***********************************************************************************/ | 199 | ***********************************************************************************/ |
209 | typedef struct file* RTMP_OS_FD; | 200 | typedef struct file *RTMP_OS_FD; |
210 | 201 | ||
211 | typedef struct _RTMP_OS_FS_INFO_ | 202 | typedef struct _RTMP_OS_FS_INFO_ { |
212 | { | 203 | int fsuid; |
213 | int fsuid; | 204 | int fsgid; |
214 | int fsgid; | 205 | mm_segment_t fs; |
215 | mm_segment_t fs; | 206 | } RTMP_OS_FS_INFO; |
216 | }RTMP_OS_FS_INFO; | ||
217 | 207 | ||
218 | #define IS_FILE_OPEN_ERR(_fd) IS_ERR((_fd)) | 208 | #define IS_FILE_OPEN_ERR(_fd) IS_ERR((_fd)) |
219 | 209 | ||
220 | |||
221 | /*********************************************************************************** | 210 | /*********************************************************************************** |
222 | * OS semaphore related data structure and definitions | 211 | * OS semaphore related data structure and definitions |
223 | ***********************************************************************************/ | 212 | ***********************************************************************************/ |
224 | struct os_lock { | 213 | struct os_lock { |
225 | spinlock_t lock; | 214 | spinlock_t lock; |
226 | unsigned long flags; | 215 | unsigned long flags; |
227 | }; | 216 | }; |
228 | 217 | ||
229 | typedef spinlock_t NDIS_SPIN_LOCK; | 218 | typedef spinlock_t NDIS_SPIN_LOCK; |
230 | 219 | ||
231 | // | 220 | // |
232 | // spin_lock enhanced for Nested spin lock | 221 | // spin_lock enhanced for Nested spin lock |
@@ -239,7 +228,6 @@ typedef spinlock_t NDIS_SPIN_LOCK; | |||
239 | #define NdisFreeSpinLock(lock) \ | 228 | #define NdisFreeSpinLock(lock) \ |
240 | do{}while(0) | 229 | do{}while(0) |
241 | 230 | ||
242 | |||
243 | #define RTMP_SEM_LOCK(__lock) \ | 231 | #define RTMP_SEM_LOCK(__lock) \ |
244 | { \ | 232 | { \ |
245 | spin_lock_bh((spinlock_t *)(__lock)); \ | 233 | spin_lock_bh((spinlock_t *)(__lock)); \ |
@@ -250,7 +238,6 @@ typedef spinlock_t NDIS_SPIN_LOCK; | |||
250 | spin_unlock_bh((spinlock_t *)(__lock)); \ | 238 | spin_unlock_bh((spinlock_t *)(__lock)); \ |
251 | } | 239 | } |
252 | 240 | ||
253 | |||
254 | // sample, use semaphore lock to replace IRQ lock, 2007/11/15 | 241 | // sample, use semaphore lock to replace IRQ lock, 2007/11/15 |
255 | #define RTMP_IRQ_LOCK(__lock, __irqflags) \ | 242 | #define RTMP_IRQ_LOCK(__lock, __irqflags) \ |
256 | { \ | 243 | { \ |
@@ -343,7 +330,7 @@ do { \ | |||
343 | /*********************************************************************************** | 330 | /*********************************************************************************** |
344 | * OS Memory Access related data structure and definitions | 331 | * OS Memory Access related data structure and definitions |
345 | ***********************************************************************************/ | 332 | ***********************************************************************************/ |
346 | #define MEM_ALLOC_FLAG (GFP_ATOMIC) //(GFP_DMA | GFP_ATOMIC) | 333 | #define MEM_ALLOC_FLAG (GFP_ATOMIC) //(GFP_DMA | GFP_ATOMIC) |
347 | 334 | ||
348 | #define NdisMoveMemory(Destination, Source, Length) memmove(Destination, Source, Length) | 335 | #define NdisMoveMemory(Destination, Source, Length) memmove(Destination, Source, Length) |
349 | #define NdisCopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length) | 336 | #define NdisCopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length) |
@@ -358,32 +345,29 @@ do { \ | |||
358 | 345 | ||
359 | #define COPY_MAC_ADDR(Addr1, Addr2) memcpy((Addr1), (Addr2), MAC_ADDR_LEN) | 346 | #define COPY_MAC_ADDR(Addr1, Addr2) memcpy((Addr1), (Addr2), MAC_ADDR_LEN) |
360 | 347 | ||
361 | |||
362 | /*********************************************************************************** | 348 | /*********************************************************************************** |
363 | * OS task related data structure and definitions | 349 | * OS task related data structure and definitions |
364 | ***********************************************************************************/ | 350 | ***********************************************************************************/ |
365 | #define RTMP_OS_MGMT_TASK_FLAGS CLONE_VM | 351 | #define RTMP_OS_MGMT_TASK_FLAGS CLONE_VM |
366 | 352 | ||
367 | typedef struct pid * THREAD_PID; | 353 | typedef struct pid *THREAD_PID; |
368 | #define THREAD_PID_INIT_VALUE NULL | 354 | #define THREAD_PID_INIT_VALUE NULL |
369 | #define GET_PID(_v) find_get_pid((_v)) | 355 | #define GET_PID(_v) find_get_pid((_v)) |
370 | #define GET_PID_NUMBER(_v) pid_nr((_v)) | 356 | #define GET_PID_NUMBER(_v) pid_nr((_v)) |
371 | #define CHECK_PID_LEGALITY(_pid) if (pid_nr((_pid)) > 0) | 357 | #define CHECK_PID_LEGALITY(_pid) if (pid_nr((_pid)) > 0) |
372 | #define KILL_THREAD_PID(_A, _B, _C) kill_pid((_A), (_B), (_C)) | 358 | #define KILL_THREAD_PID(_A, _B, _C) kill_pid((_A), (_B), (_C)) |
373 | 359 | ||
374 | typedef struct tasklet_struct RTMP_NET_TASK_STRUCT; | 360 | typedef struct tasklet_struct RTMP_NET_TASK_STRUCT; |
375 | typedef struct tasklet_struct *PRTMP_NET_TASK_STRUCT; | 361 | typedef struct tasklet_struct *PRTMP_NET_TASK_STRUCT; |
376 | |||
377 | 362 | ||
378 | /*********************************************************************************** | 363 | /*********************************************************************************** |
379 | * Timer related definitions and data structures. | 364 | * Timer related definitions and data structures. |
380 | **********************************************************************************/ | 365 | **********************************************************************************/ |
381 | #define OS_HZ HZ | 366 | #define OS_HZ HZ |
382 | 367 | ||
383 | typedef struct timer_list NDIS_MINIPORT_TIMER; | 368 | typedef struct timer_list NDIS_MINIPORT_TIMER; |
384 | typedef struct timer_list RTMP_OS_TIMER; | 369 | typedef struct timer_list RTMP_OS_TIMER; |
385 | typedef void (*TIMER_FUNCTION)(unsigned long); | 370 | typedef void (*TIMER_FUNCTION) (unsigned long); |
386 | |||
387 | 371 | ||
388 | #define OS_WAIT(_time) \ | 372 | #define OS_WAIT(_time) \ |
389 | { int _i; \ | 373 | { int _i; \ |
@@ -406,26 +390,25 @@ typedef void (*TIMER_FUNCTION)(unsigned long); | |||
406 | 390 | ||
407 | #define ONE_TICK 1 | 391 | #define ONE_TICK 1 |
408 | 392 | ||
409 | static inline void NdisGetSystemUpTime(ULONG *time) | 393 | static inline void NdisGetSystemUpTime(ULONG * time) |
410 | { | 394 | { |
411 | *time = jiffies; | 395 | *time = jiffies; |
412 | } | 396 | } |
413 | 397 | ||
414 | |||
415 | /*********************************************************************************** | 398 | /*********************************************************************************** |
416 | * OS specific cookie data structure binding to RTMP_ADAPTER | 399 | * OS specific cookie data structure binding to RTMP_ADAPTER |
417 | ***********************************************************************************/ | 400 | ***********************************************************************************/ |
418 | 401 | ||
419 | struct os_cookie { | 402 | struct os_cookie { |
420 | #ifdef RTMP_MAC_PCI | 403 | #ifdef RTMP_MAC_PCI |
421 | struct pci_dev *pci_dev; | 404 | struct pci_dev *pci_dev; |
422 | struct pci_dev *parent_pci_dev; | 405 | struct pci_dev *parent_pci_dev; |
423 | USHORT DeviceID; | 406 | USHORT DeviceID; |
424 | dma_addr_t pAd_pa; | 407 | dma_addr_t pAd_pa; |
425 | #endif // RTMP_MAC_PCI // | 408 | #endif // RTMP_MAC_PCI // |
426 | #ifdef RTMP_MAC_USB | 409 | #ifdef RTMP_MAC_USB |
427 | struct usb_device *pUsb_Dev; | 410 | struct usb_device *pUsb_Dev; |
428 | #endif // RTMP_MAC_USB // | 411 | #endif // RTMP_MAC_USB // |
429 | 412 | ||
430 | RTMP_NET_TASK_STRUCT rx_done_task; | 413 | RTMP_NET_TASK_STRUCT rx_done_task; |
431 | RTMP_NET_TASK_STRUCT mgmt_dma_done_task; | 414 | RTMP_NET_TASK_STRUCT mgmt_dma_done_task; |
@@ -436,21 +419,19 @@ struct os_cookie { | |||
436 | RTMP_NET_TASK_STRUCT tbtt_task; | 419 | RTMP_NET_TASK_STRUCT tbtt_task; |
437 | #ifdef RTMP_MAC_PCI | 420 | #ifdef RTMP_MAC_PCI |
438 | RTMP_NET_TASK_STRUCT fifo_statistic_full_task; | 421 | RTMP_NET_TASK_STRUCT fifo_statistic_full_task; |
439 | #endif // RTMP_MAC_PCI // | 422 | #endif // RTMP_MAC_PCI // |
440 | #ifdef RTMP_MAC_USB | 423 | #ifdef RTMP_MAC_USB |
441 | RTMP_NET_TASK_STRUCT null_frame_complete_task; | 424 | RTMP_NET_TASK_STRUCT null_frame_complete_task; |
442 | RTMP_NET_TASK_STRUCT rts_frame_complete_task; | 425 | RTMP_NET_TASK_STRUCT rts_frame_complete_task; |
443 | RTMP_NET_TASK_STRUCT pspoll_frame_complete_task; | 426 | RTMP_NET_TASK_STRUCT pspoll_frame_complete_task; |
444 | #endif // RTMP_MAC_USB // | 427 | #endif // RTMP_MAC_USB // |
445 | 428 | ||
446 | unsigned long apd_pid; //802.1x daemon pid | 429 | unsigned long apd_pid; //802.1x daemon pid |
447 | INT ioctl_if_type; | 430 | INT ioctl_if_type; |
448 | INT ioctl_if; | 431 | INT ioctl_if; |
449 | }; | 432 | }; |
450 | 433 | ||
451 | typedef struct os_cookie * POS_COOKIE; | 434 | typedef struct os_cookie *POS_COOKIE; |
452 | |||
453 | |||
454 | 435 | ||
455 | /*********************************************************************************** | 436 | /*********************************************************************************** |
456 | * OS debugging and printing related definitions and data structure | 437 | * OS debugging and printing related definitions and data structure |
@@ -459,7 +440,7 @@ typedef struct os_cookie * POS_COOKIE; | |||
459 | addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] | 440 | addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] |
460 | 441 | ||
461 | #ifdef DBG | 442 | #ifdef DBG |
462 | extern ULONG RTDebugLevel; | 443 | extern ULONG RTDebugLevel; |
463 | 444 | ||
464 | #define DBGPRINT_RAW(Level, Fmt) \ | 445 | #define DBGPRINT_RAW(Level, Fmt) \ |
465 | do{ \ | 446 | do{ \ |
@@ -471,7 +452,6 @@ do{ \ | |||
471 | 452 | ||
472 | #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) | 453 | #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) |
473 | 454 | ||
474 | |||
475 | #define DBGPRINT_ERR(Fmt) \ | 455 | #define DBGPRINT_ERR(Fmt) \ |
476 | { \ | 456 | { \ |
477 | printk("ERROR!!! "); \ | 457 | printk("ERROR!!! "); \ |
@@ -483,7 +463,6 @@ do{ \ | |||
483 | printk Fmt; \ | 463 | printk Fmt; \ |
484 | } | 464 | } |
485 | 465 | ||
486 | |||
487 | #else | 466 | #else |
488 | #define DBGPRINT(Level, Fmt) | 467 | #define DBGPRINT(Level, Fmt) |
489 | #define DBGPRINT_RAW(Level, Fmt) | 468 | #define DBGPRINT_RAW(Level, Fmt) |
@@ -495,18 +474,18 @@ do{ \ | |||
495 | 474 | ||
496 | void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen); | 475 | void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen); |
497 | 476 | ||
498 | |||
499 | /********************************************************************************************************* | 477 | /********************************************************************************************************* |
500 | The following code are not revised, temporary put it here. | 478 | The following code are not revised, temporary put it here. |
501 | *********************************************************************************************************/ | 479 | *********************************************************************************************************/ |
502 | 480 | ||
503 | |||
504 | /*********************************************************************************** | 481 | /*********************************************************************************** |
505 | * Device DMA Access related definitions and data structures. | 482 | * Device DMA Access related definitions and data structures. |
506 | **********************************************************************************/ | 483 | **********************************************************************************/ |
507 | #ifdef RTMP_MAC_PCI | 484 | #ifdef RTMP_MAC_PCI |
508 | dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size, int sd_idx, int direction); | 485 | dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size, |
509 | void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int direction); | 486 | int sd_idx, int direction); |
487 | void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, | ||
488 | int direction); | ||
510 | 489 | ||
511 | #define PCI_MAP_SINGLE(_handle, _ptr, _size, _sd_idx, _dir) \ | 490 | #define PCI_MAP_SINGLE(_handle, _ptr, _size, _sd_idx, _dir) \ |
512 | linux_pci_map_single(_handle, _ptr, _size, _sd_idx, _dir) | 491 | linux_pci_map_single(_handle, _ptr, _size, _sd_idx, _dir) |
@@ -562,8 +541,6 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int | |||
562 | 541 | ||
563 | #define NdisMIndicateStatus(_w, _x, _y, _z) | 542 | #define NdisMIndicateStatus(_w, _x, _y, _z) |
564 | 543 | ||
565 | |||
566 | |||
567 | /*********************************************************************************** | 544 | /*********************************************************************************** |
568 | * Device Register I/O Access related definitions and data structures. | 545 | * Device Register I/O Access related definitions and data structures. |
569 | **********************************************************************************/ | 546 | **********************************************************************************/ |
@@ -729,7 +706,6 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int | |||
729 | #define GET_OS_PKT_NEXT(_pkt) \ | 706 | #define GET_OS_PKT_NEXT(_pkt) \ |
730 | (RTPKT_TO_OSPKT(_pkt)->next) | 707 | (RTPKT_TO_OSPKT(_pkt)->next) |
731 | 708 | ||
732 | |||
733 | #define OS_PKT_CLONED(_pkt) skb_cloned(RTPKT_TO_OSPKT(_pkt)) | 709 | #define OS_PKT_CLONED(_pkt) skb_cloned(RTPKT_TO_OSPKT(_pkt)) |
734 | 710 | ||
735 | #define OS_NTOHS(_Val) \ | 711 | #define OS_NTOHS(_Val) \ |
@@ -783,9 +759,8 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int | |||
783 | #define RTMP_SET_PACKET_MOREDATA(_p, _morebit) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7] = _morebit) | 759 | #define RTMP_SET_PACKET_MOREDATA(_p, _morebit) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7] = _morebit) |
784 | #define RTMP_GET_PACKET_MOREDATA(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7]) | 760 | #define RTMP_GET_PACKET_MOREDATA(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7]) |
785 | 761 | ||
786 | |||
787 | // | 762 | // |
788 | // Sepcific Pakcet Type definition | 763 | // Sepcific Pakcet Type definition |
789 | // | 764 | // |
790 | #define RTMP_PACKET_SPECIFIC_CB_OFFSET 11 | 765 | #define RTMP_PACKET_SPECIFIC_CB_OFFSET 11 |
791 | 766 | ||
@@ -863,13 +838,10 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int | |||
863 | 838 | ||
864 | #define RTMP_GET_PACKET_IPV4(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+11] & RTMP_PACKET_SPECIFIC_IPV4) | 839 | #define RTMP_GET_PACKET_IPV4(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+11] & RTMP_PACKET_SPECIFIC_IPV4) |
865 | 840 | ||
866 | |||
867 | // If this flag is set, it indicates that this EAPoL frame MUST be clear. | 841 | // If this flag is set, it indicates that this EAPoL frame MUST be clear. |
868 | #define RTMP_SET_PACKET_CLEAR_EAP_FRAME(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12] = _flg) | 842 | #define RTMP_SET_PACKET_CLEAR_EAP_FRAME(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12] = _flg) |
869 | #define RTMP_GET_PACKET_CLEAR_EAP_FRAME(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12]) | 843 | #define RTMP_GET_PACKET_CLEAR_EAP_FRAME(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12]) |
870 | 844 | ||
871 | |||
872 | |||
873 | /* use bit3 of cb[CB_OFF+16] */ | 845 | /* use bit3 of cb[CB_OFF+16] */ |
874 | 846 | ||
875 | #define RTMP_SET_PACKET_5VT(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+22] = _flg) | 847 | #define RTMP_SET_PACKET_5VT(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+22] = _flg) |
@@ -877,12 +849,10 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int | |||
877 | 849 | ||
878 | /* Max skb->cb = 48B = [CB_OFF+38] */ | 850 | /* Max skb->cb = 48B = [CB_OFF+38] */ |
879 | 851 | ||
880 | |||
881 | |||
882 | /*********************************************************************************** | 852 | /*********************************************************************************** |
883 | * Other function prototypes definitions | 853 | * Other function prototypes definitions |
884 | ***********************************************************************************/ | 854 | ***********************************************************************************/ |
885 | void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time); | 855 | void RTMP_GetCurrentSystemTime(LARGE_INTEGER * time); |
886 | int rt28xx_packet_xmit(struct sk_buff *skb); | 856 | int rt28xx_packet_xmit(struct sk_buff *skb); |
887 | 857 | ||
888 | #ifdef RTMP_MAC_PCI | 858 | #ifdef RTMP_MAC_PCI |
@@ -892,13 +862,10 @@ int rt28xx_packet_xmit(struct sk_buff *skb); | |||
892 | IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance); | 862 | IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance); |
893 | #endif // RTMP_MAC_PCI // | 863 | #endif // RTMP_MAC_PCI // |
894 | 864 | ||
895 | INT rt28xx_sta_ioctl( | 865 | INT rt28xx_sta_ioctl(IN PNET_DEV net_dev, IN OUT struct ifreq *rq, IN INT cmd); |
896 | IN PNET_DEV net_dev, | ||
897 | IN OUT struct ifreq *rq, | ||
898 | IN INT cmd); | ||
899 | 866 | ||
900 | extern int ra_mtd_write(int num, loff_t to, size_t len, const u_char *buf); | 867 | extern int ra_mtd_write(int num, loff_t to, size_t len, const u_char * buf); |
901 | extern int ra_mtd_read(int num, loff_t from, size_t len, u_char *buf); | 868 | extern int ra_mtd_read(int num, loff_t from, size_t len, u_char * buf); |
902 | 869 | ||
903 | #define GET_PAD_FROM_NET_DEV(_pAd, _net_dev) (_pAd) = (PRTMP_ADAPTER)(_net_dev)->ml_priv; | 870 | #define GET_PAD_FROM_NET_DEV(_pAd, _net_dev) (_pAd) = (PRTMP_ADAPTER)(_net_dev)->ml_priv; |
904 | 871 | ||