vserver 1.9.3

[linux-2.6.git] / sound / pci / ice1712 / ice1712.h

diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
index 8b4bc08..1d8998f 100644 (file)
--- a/sound/pci/ice1712/ice1712.h
+++ b/sound/pci/ice1712/ice1712.h
@@ -294,13 +294,9 @@ struct _snd_ice1712 {
        int irq;
 
        unsigned long port;
-       struct resource *res_port;
        unsigned long ddma_port;
-       struct resource *res_ddma_port;
        unsigned long dmapath_port;
-       struct resource *res_dmapath_port;
        unsigned long profi_port;
-       struct resource *res_profi_port;
 
        struct pci_dev *pci;
        snd_card_t *card;
@@ -329,6 +325,10 @@ struct _snd_ice1712 {
        unsigned int pro_volumes[20];
        unsigned int omni: 1;           /* Delta Omni I/O */
        unsigned int vt1724: 1;
+       unsigned int vt1720: 1;
+       unsigned int has_spdif: 1;      /* VT1720/4 - has SPDIF I/O */
+       unsigned int force_pdma4: 1;    /* VT1720/4 - PDMA4 as non-spdif */
+       unsigned int force_rdma1: 1;    /* VT1720/4 - RDMA1 as non-spdif */
        unsigned int num_total_dacs;    /* total DACs */
        unsigned int num_total_adcs;    /* total ADCs */
        unsigned char hoontech_boxbits[4];
@@ -364,8 +364,6 @@ struct _snd_ice1712 {
        struct semaphore gpio_mutex;
 };
 
-#define chip_t ice1712_t
-
 
 /*
  * gpio access functions
@@ -460,6 +458,8 @@ static inline u8 snd_ice1712_read(ice1712_t * ice, u8 addr)
 struct snd_ice1712_card_info {
        unsigned int subvendor;
        char *name;
+       char *model;
+       char *driver;
        int (*chip_init)(ice1712_t *);
        int (*build_controls)(ice1712_t *);
        int no_mpu401: 1;