Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337818
b: refs/heads/master
c: 3d20e8e
h: refs/heads/master
v: v3
  • Loading branch information
Adil Mujeeb authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent b369faa commit 8f8b0e4
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2820663c6f08f838398b0727773fb44e08876969
refs/heads/master: 3d20e8e8f94b3b5924ff7a018aa73496089aca8b
62 changes: 31 additions & 31 deletions trunk/drivers/staging/winbond/wb35rx_s.h
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
//============================================================================
// wb35rx.h --
//============================================================================
#ifndef __WINBOND_35RX_S_H
#define __WINBOND_35RX_S_H

// Definition for this module used
#define MAX_USB_RX_BUFFER 4096 // This parameter must be 4096 931130.4.f
/* Definition for this module used */
#define MAX_USB_RX_BUFFER 4096 /* This parameter must be 4096 931130.4.f */
#define MAX_USB_RX_BUFFER_NUMBER ETHERNET_RX_DESCRIPTORS /* Maximum 254, 255 is RESERVED ID */
#define RX_INTERFACE 0 /* Interface 1 */
#define RX_PIPE 2 /* Pipe 3 */
#define MAX_PACKET_SIZE 1600 /* 1568 = 8 + 1532 + 4 + 24(IV EIV MIC ICV CRC) for check DMA data 931130.4.g */
#define RX_END_TAG 0x0badbeef

#define MAX_USB_RX_BUFFER_NUMBER ETHERNET_RX_DESCRIPTORS // Maximum 254, 255 is RESERVED ID
#define RX_INTERFACE 0 // Interface 1
#define RX_PIPE 2 // Pipe 3
#define MAX_PACKET_SIZE 1600 //1568 // 8 + 1532 + 4 + 24(IV EIV MIC ICV CRC) for check DMA data 931130.4.g
#define RX_END_TAG 0x0badbeef


//====================================
// Internal variable for module
//====================================
/*
* Internal variable for module
*/
struct wb35_rx {
u32 ByteReceived;// For calculating throughput of BulkIn
atomic_t RxFireCounter;// Does Wb35Rx module fire?
u32 ByteReceived; /* For calculating throughput of BulkIn */
atomic_t RxFireCounter;/* Does Wb35Rx module fire? */

u8 RxBuffer[ MAX_USB_RX_BUFFER_NUMBER ][ ((MAX_USB_RX_BUFFER+3) & ~0x03 ) ];
u16 RxBufferSize[ ((MAX_USB_RX_BUFFER_NUMBER+1) & ~0x01) ];
u8 RxOwner[ ((MAX_USB_RX_BUFFER_NUMBER+3) & ~0x03 ) ];//Ownership of buffer 0: SW 1:HW
u8 RxBuffer[MAX_USB_RX_BUFFER_NUMBER][((MAX_USB_RX_BUFFER+3) & ~0x03)];
u16 RxBufferSize[((MAX_USB_RX_BUFFER_NUMBER+1) & ~0x01)];
u8 RxOwner[((MAX_USB_RX_BUFFER_NUMBER+3) & ~0x03)]; /* Ownership of buffer 0:SW 1:HW */

u32 RxProcessIndex;//The next index to process
u32 RxBufferId;
u32 EP3vm_state;
u32 RxProcessIndex; /* The next index to process */
u32 RxBufferId;
u32 EP3vm_state;

u32 rx_halt; // For VM stopping
u32 rx_halt; /* For VM stopping */

u16 MoreDataSize;
u16 PacketSize;
u16 MoreDataSize;
u16 PacketSize;

u32 CurrentRxBufferId; // For complete routine usage
u32 Rx3UrbCancel;
u32 CurrentRxBufferId; /* For complete routine usage */
u32 Rx3UrbCancel;

u32 LastR1; // For RSSI reporting
struct urb * RxUrb;
u32 Ep3ErrorCount2; // 20060625.1 Usbd for Rx DMA error count
u32 LastR1; /* For RSSI reporting */
struct urb *RxUrb;
u32 Ep3ErrorCount2; /* 20060625.1 Usbd for Rx DMA error count */

int EP3VM_status;
u8 * pDRx;
u8 *pDRx;
};

#endif /* __WINBOND_35RX_S_H */

0 comments on commit 8f8b0e4

Please sign in to comment.