From 75f6d0639c53d0af917a643fa5b082b108f4b91d Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Fri, 15 Oct 2010 14:13:00 +0200 Subject: [PATCH] --- yaml --- r: 220361 b: refs/heads/master c: 151adba757ef15aae46a1638536ab3b2b077efaf h: refs/heads/master i: 220359: 492804de819cf26218aaa6b62f0a8c7fa3fa2681 v: v3 --- [refs] | 2 +- .../staging/ft1000/ft1000-usb/ft1000_usb.h | 27 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 26b87788b223..8fea5549dabf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 369e857e9610c9a2474df8817ab0087de5765f2d +refs/heads/master: 151adba757ef15aae46a1638536ab3b2b077efaf diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h index 875c9f9cbf4d..a1a2a75b0575 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h @@ -77,19 +77,18 @@ struct dsp_init_msg { } __attribute__ ((packed)); -typedef struct _APP_INFO_BLOCK -{ - u32 nTxMsg; // DPRAM msg sent to DSP with app_id - u32 nRxMsg; // DPRAM msg rcv from dsp with app_id - u32 nTxMsgReject; // DPRAM msg rejected due to DSP doorbell set - u32 nRxMsgMiss; // DPRAM msg dropped due to overflow - struct fown_struct *fileobject;// Application's file object - u16 app_id; // Application id - int DspBCMsgFlag; - int NumOfMsg; // number of messages queued up - wait_queue_head_t wait_dpram_msg; - struct list_head app_sqlist; // link list of msgs for applicaton on slow queue -} APP_INFO_BLOCK, *PAPP_INFO_BLOCK; +struct app_info_block { + u32 nTxMsg; // DPRAM msg sent to DSP with app_id + u32 nRxMsg; // DPRAM msg rcv from dsp with app_id + u32 nTxMsgReject; // DPRAM msg rejected due to DSP doorbell set + u32 nRxMsgMiss; // DPRAM msg dropped due to overflow + struct fown_struct *fileobject;// Application's file object + u16 app_id; // Application id + int DspBCMsgFlag; + int NumOfMsg; // number of messages queued up + wait_queue_head_t wait_dpram_msg; + struct list_head app_sqlist; // link list of msgs for applicaton on slow queue +} __attribute__((packed)); typedef struct _PROV_RECORD { struct list_head list; @@ -582,7 +581,7 @@ typedef struct _FT1000_INFO { u16 ProgConStat; struct list_head prov_list; int appcnt; - APP_INFO_BLOCK app_info[MAX_NUM_APP]; //Added by Jim + struct app_info_block app_info[MAX_NUM_APP]; u16 DSPInfoBlklen; u16 DrvMsgPend; int (*ft1000_reset)(struct net_device *dev);