提交 bd6fe9e1 编写于 作者: L Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

此差异已折叠。
...@@ -139,51 +139,50 @@ ...@@ -139,51 +139,50 @@
struct wbsd_host struct wbsd_host
{ {
struct mmc_host* mmc; /* MMC structure */ struct mmc_host* mmc; /* MMC structure */
spinlock_t lock; /* Mutex */ spinlock_t lock; /* Mutex */
int flags; /* Driver states */ int flags; /* Driver states */
#define WBSD_FCARD_PRESENT (1<<0) /* Card is present */ #define WBSD_FCARD_PRESENT (1<<0) /* Card is present */
#define WBSD_FIGNORE_DETECT (1<<1) /* Ignore card detection */ #define WBSD_FIGNORE_DETECT (1<<1) /* Ignore card detection */
struct mmc_request* mrq; /* Current request */ struct mmc_request* mrq; /* Current request */
u8 isr; /* Accumulated ISR */ u8 isr; /* Accumulated ISR */
struct scatterlist* cur_sg; /* Current SG entry */ struct scatterlist* cur_sg; /* Current SG entry */
unsigned int num_sg; /* Number of entries left */ unsigned int num_sg; /* Number of entries left */
void* mapped_sg; /* vaddr of mapped sg */ void* mapped_sg; /* vaddr of mapped sg */
unsigned int offset; /* Offset into current entry */ unsigned int offset; /* Offset into current entry */
unsigned int remain; /* Data left in curren entry */ unsigned int remain; /* Data left in curren entry */
int size; /* Total size of transfer */ int size; /* Total size of transfer */
char* dma_buffer; /* ISA DMA buffer */ char* dma_buffer; /* ISA DMA buffer */
dma_addr_t dma_addr; /* Physical address for same */ dma_addr_t dma_addr; /* Physical address for same */
int firsterr; /* See fifo functions */ int firsterr; /* See fifo functions */
u8 clk; /* Current clock speed */ u8 clk; /* Current clock speed */
unsigned char bus_width; /* Current bus width */ unsigned char bus_width; /* Current bus width */
int config; /* Config port */ int config; /* Config port */
u8 unlock_code; /* Code to unlock config */ u8 unlock_code; /* Code to unlock config */
int chip_id; /* ID of controller */ int chip_id; /* ID of controller */
int base; /* I/O port base */ int base; /* I/O port base */
int irq; /* Interrupt */ int irq; /* Interrupt */
int dma; /* DMA channel */ int dma; /* DMA channel */
struct tasklet_struct card_tasklet; /* Tasklet structures */ struct tasklet_struct card_tasklet; /* Tasklet structures */
struct tasklet_struct fifo_tasklet; struct tasklet_struct fifo_tasklet;
struct tasklet_struct crc_tasklet; struct tasklet_struct crc_tasklet;
struct tasklet_struct timeout_tasklet; struct tasklet_struct timeout_tasklet;
struct tasklet_struct finish_tasklet; struct tasklet_struct finish_tasklet;
struct tasklet_struct block_tasklet; struct tasklet_struct block_tasklet;
struct timer_list detect_timer; /* Card detection timer */
struct timer_list ignore_timer; /* Ignore detection timer */ struct timer_list ignore_timer; /* Ignore detection timer */
}; };
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册