doc: fix broken references
[linux-2.6.git] / drivers / media / dvb / dvb-usb / a800.c
index 49f541d..b95a95e 100644 (file)
@@ -18,6 +18,9 @@
 static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (rc=1 (or-able))." DVB_USB_DEBUG_STATUS);
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 #define deb_rc(args...)   dprintk(debug,0x01,args)
 
 static int a800_power_ctrl(struct dvb_usb_device *d, int onoff)
@@ -26,67 +29,85 @@ static int a800_power_ctrl(struct dvb_usb_device *d, int onoff)
        return 0;
 }
 
-static struct dvb_usb_rc_key a800_rc_keys[] = {
-       { 0x02, 0x01, KEY_PROG1 },       /* SOURCE */
-       { 0x02, 0x00, KEY_POWER },       /* POWER */
-       { 0x02, 0x05, KEY_1 },           /* 1 */
-       { 0x02, 0x06, KEY_2 },           /* 2 */
-       { 0x02, 0x07, KEY_3 },           /* 3 */
-       { 0x02, 0x09, KEY_4 },           /* 4 */
-       { 0x02, 0x0a, KEY_5 },           /* 5 */
-       { 0x02, 0x0b, KEY_6 },           /* 6 */
-       { 0x02, 0x0d, KEY_7 },           /* 7 */
-       { 0x02, 0x0e, KEY_8 },           /* 8 */
-       { 0x02, 0x0f, KEY_9 },           /* 9 */
-       { 0x02, 0x12, KEY_LEFT },        /* L / DISPLAY */
-       { 0x02, 0x11, KEY_0 },           /* 0 */
-       { 0x02, 0x13, KEY_RIGHT },       /* R / CH RTN */
-       { 0x02, 0x17, KEY_PROG2 },       /* SNAP SHOT */
-       { 0x02, 0x10, KEY_PROG3 },       /* 16-CH PREV */
-       { 0x02, 0x1e, KEY_VOLUMEDOWN },  /* VOL DOWN */
-       { 0x02, 0x0c, KEY_ZOOM },        /* FULL SCREEN */
-       { 0x02, 0x1f, KEY_VOLUMEUP },    /* VOL UP */
-       { 0x02, 0x14, KEY_MUTE },        /* MUTE */
-       { 0x02, 0x08, KEY_AUDIO },       /* AUDIO */
-       { 0x02, 0x19, KEY_RECORD },      /* RECORD */
-       { 0x02, 0x18, KEY_PLAY },        /* PLAY */
-       { 0x02, 0x1b, KEY_STOP },        /* STOP */
-       { 0x02, 0x1a, KEY_PLAYPAUSE },   /* TIMESHIFT / PAUSE */
-       { 0x02, 0x1d, KEY_BACK },        /* << / RED */
-       { 0x02, 0x1c, KEY_FORWARD },     /* >> / YELLOW */
-       { 0x02, 0x03, KEY_TEXT },        /* TELETEXT */
-       { 0x02, 0x04, KEY_EPG },         /* EPG */
-       { 0x02, 0x15, KEY_MENU },        /* MENU */
-
-       { 0x03, 0x03, KEY_CHANNELUP },   /* CH UP */
-       { 0x03, 0x02, KEY_CHANNELDOWN }, /* CH DOWN */
-       { 0x03, 0x01, KEY_FIRST },       /* |<< / GREEN */
-       { 0x03, 0x00, KEY_LAST },        /* >>| / BLUE */
+/* assure to put cold to 0 for iManufacturer == 1 */
+static int a800_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
+       struct dvb_usb_device_description **desc, int *cold)
+{
+       *cold = udev->descriptor.iManufacturer != 1;
+       return 0;
+}
+
+static struct rc_map_table rc_map_a800_table[] = {
+       { 0x0201, KEY_MODE },      /* SOURCE */
+       { 0x0200, KEY_POWER2 },      /* POWER */
+       { 0x0205, KEY_1 },           /* 1 */
+       { 0x0206, KEY_2 },           /* 2 */
+       { 0x0207, KEY_3 },           /* 3 */
+       { 0x0209, KEY_4 },           /* 4 */
+       { 0x020a, KEY_5 },           /* 5 */
+       { 0x020b, KEY_6 },           /* 6 */
+       { 0x020d, KEY_7 },           /* 7 */
+       { 0x020e, KEY_8 },           /* 8 */
+       { 0x020f, KEY_9 },           /* 9 */
+       { 0x0212, KEY_LEFT },        /* L / DISPLAY */
+       { 0x0211, KEY_0 },           /* 0 */
+       { 0x0213, KEY_RIGHT },       /* R / CH RTN */
+       { 0x0217, KEY_CAMERA },      /* SNAP SHOT */
+       { 0x0210, KEY_LAST },        /* 16-CH PREV */
+       { 0x021e, KEY_VOLUMEDOWN },  /* VOL DOWN */
+       { 0x020c, KEY_ZOOM },        /* FULL SCREEN */
+       { 0x021f, KEY_VOLUMEUP },    /* VOL UP */
+       { 0x0214, KEY_MUTE },        /* MUTE */
+       { 0x0208, KEY_AUDIO },       /* AUDIO */
+       { 0x0219, KEY_RECORD },      /* RECORD */
+       { 0x0218, KEY_PLAY },        /* PLAY */
+       { 0x021b, KEY_STOP },        /* STOP */
+       { 0x021a, KEY_PLAYPAUSE },   /* TIMESHIFT / PAUSE */
+       { 0x021d, KEY_BACK },        /* << / RED */
+       { 0x021c, KEY_FORWARD },     /* >> / YELLOW */
+       { 0x0203, KEY_TEXT },        /* TELETEXT */
+       { 0x0204, KEY_EPG },         /* EPG */
+       { 0x0215, KEY_MENU },        /* MENU */
+
+       { 0x0303, KEY_CHANNELUP },   /* CH UP */
+       { 0x0302, KEY_CHANNELDOWN }, /* CH DOWN */
+       { 0x0301, KEY_FIRST },       /* |<< / GREEN */
+       { 0x0300, KEY_LAST },        /* >>| / BLUE */
 
 };
 
-int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
-       u8 key[5];
+       int ret;
+       u8 *key = kmalloc(5, GFP_KERNEL);
+       if (!key)
+               return -ENOMEM;
+
        if (usb_control_msg(d->udev,usb_rcvctrlpipe(d->udev,0),
                                0x04, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, key, 5,
-                               2000) != 5)
-               return -ENODEV;
+                               2000) != 5) {
+               ret = -ENODEV;
+               goto out;
+       }
 
        /* call the universal NEC remote processor, to find out the key's state and event */
        dvb_usb_nec_rc_key_to_event(d,key,event,state);
        if (key[0] != 0)
                deb_rc("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
-       return 0;
+       ret = 0;
+out:
+       kfree(key);
+       return ret;
 }
 
 /* USB Driver stuff */
-static struct dvb_usb_properties a800_properties;
+static struct dvb_usb_device_properties a800_properties;
 
 static int a800_probe(struct usb_interface *intf,
                const struct usb_device_id *id)
 {
-       return dvb_usb_device_init(intf,&a800_properties,THIS_MODULE,NULL);
+       return dvb_usb_device_init(intf, &a800_properties,
+                                  THIS_MODULE, NULL, adapter_nr);
 }
 
 /* do not change the order of the ID table */
@@ -97,43 +118,53 @@ static struct usb_device_id a800_table [] = {
 };
 MODULE_DEVICE_TABLE (usb, a800_table);
 
-static struct dvb_usb_properties a800_properties = {
-       .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
-       .pid_filter_count = 32,
+static struct dvb_usb_device_properties a800_properties = {
+       .caps = DVB_USB_IS_AN_I2C_ADAPTER,
 
        .usb_ctrl = CYPRESS_FX2,
-
        .firmware = "dvb-usb-avertv-a800-02.fw",
 
-       .size_of_priv     = sizeof(struct dibusb_state),
+       .num_adapters = 1,
+       .adapter = {
+               {
+                       .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+                       .pid_filter_count = 32,
+                       .streaming_ctrl   = dibusb2_0_streaming_ctrl,
+                       .pid_filter       = dibusb_pid_filter,
+                       .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
+
+                       .frontend_attach  = dibusb_dib3000mc_frontend_attach,
+                       .tuner_attach     = dibusb_dib3000mc_tuner_attach,
+
+                       /* parameter for the MPEG2-data transfer */
+                                       .stream = {
+                                               .type = USB_BULK,
+                               .count = 7,
+                               .endpoint = 0x06,
+                               .u = {
+                                       .bulk = {
+                                               .buffersize = 4096,
+                                       }
+                               }
+                       },
+
+                       .size_of_priv     = sizeof(struct dibusb_state),
+               },
+       },
 
-       .streaming_ctrl   = dibusb2_0_streaming_ctrl,
-       .pid_filter       = dibusb_pid_filter,
-       .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
        .power_ctrl       = a800_power_ctrl,
-       .frontend_attach  = dibusb_dib3000mc_frontend_attach,
-       .tuner_attach     = dibusb_dib3000mc_tuner_attach,
+       .identify_state   = a800_identify_state,
 
-       .rc_interval      = DEFAULT_RC_INTERVAL,
-       .rc_key_map       = a800_rc_keys,
-       .rc_key_map_size  = ARRAY_SIZE(a800_rc_keys),
-       .rc_query         = a800_rc_query,
+       .rc.legacy = {
+               .rc_interval      = DEFAULT_RC_INTERVAL,
+               .rc_map_table     = rc_map_a800_table,
+               .rc_map_size      = ARRAY_SIZE(rc_map_a800_table),
+               .rc_query         = a800_rc_query,
+       },
 
        .i2c_algo         = &dibusb_i2c_algo,
 
        .generic_bulk_ctrl_endpoint = 0x01,
-       /* parameter for the MPEG2-data transfer */
-       .urb = {
-               .type = DVB_USB_BULK,
-               .count = 7,
-               .endpoint = 0x06,
-               .u = {
-                       .bulk = {
-                               .buffersize = 4096,
-                       }
-               }
-       },
-
        .num_device_descs = 1,
        .devices = {
                {   "AVerMedia AverTV DVB-T USB 2.0 (A800)",
@@ -144,7 +175,6 @@ static struct dvb_usb_properties a800_properties = {
 };
 
 static struct usb_driver a800_driver = {
-       .owner          = THIS_MODULE,
        .name           = "dvb_usb_a800",
        .probe          = a800_probe,
        .disconnect = dvb_usb_device_exit,