5 files changed, 66 insertions, 10 deletions

diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c
index e55322ef76b3..49f541d9a042 100644
--- a/drivers/media/dvb/dvb-usb/a800.c
+++ b/drivers/media/dvb/dvb-usb/a800.c
@@ -43,11 +43,9 @@ static struct dvb_usb_rc_key a800_rc_keys[] = {
         { 0x02, 0x13, KEY_RIGHT },       /* R / CH RTN */
         { 0x02, 0x17, KEY_PROG2 },       /* SNAP SHOT */
         { 0x02, 0x10, KEY_PROG3 },       /* 16-CH PREV */
-        { 0x02, 0x03, KEY_CHANNELUP },   /* CH UP */
         { 0x02, 0x1e, KEY_VOLUMEDOWN },  /* VOL DOWN */
         { 0x02, 0x0c, KEY_ZOOM },        /* FULL SCREEN */
         { 0x02, 0x1f, KEY_VOLUMEUP },    /* VOL UP */
-        { 0x02, 0x02, KEY_CHANNELDOWN }, /* CH DOWN */
         { 0x02, 0x14, KEY_MUTE },        /* MUTE */
         { 0x02, 0x08, KEY_AUDIO },       /* AUDIO */
         { 0x02, 0x19, KEY_RECORD },      /* RECORD */
@@ -57,8 +55,6 @@ static struct dvb_usb_rc_key a800_rc_keys[] = {
         { 0x02, 0x1d, KEY_BACK },        /* << / RED */
         { 0x02, 0x1c, KEY_FORWARD },     /* >> / YELLOW */
         { 0x02, 0x03, KEY_TEXT },        /* TELETEXT */
-        { 0x02, 0x01, KEY_FIRST },       /* |<< / GREEN */
-        { 0x02, 0x00, KEY_LAST },        /* >>| / BLUE */
         { 0x02, 0x04, KEY_EPG },         /* EPG */
         { 0x02, 0x15, KEY_MENU },        /* MENU */
 
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 0058505634a0..aa271a2496d5 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -82,13 +82,15 @@ static int dibusb_tuner_probe_and_attach(struct dvb_usb_device *d)
 static struct dvb_usb_properties dibusb1_1_properties;
 static struct dvb_usb_properties dibusb1_1_an2235_properties;
 static struct dvb_usb_properties dibusb2_0b_properties;
+static struct dvb_usb_properties artec_t1_usb2_properties;
 
 static int dibusb_probe(struct usb_interface *intf,
                 const struct usb_device_id *id)
 {
         if (dvb_usb_device_init(intf,&dibusb1_1_properties,THIS_MODULE,NULL) == 0 ||
                 dvb_usb_device_init(intf,&dibusb1_1_an2235_properties,THIS_MODULE,NULL) == 0 ||
-                dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE,NULL) == 0)
+                dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE,NULL) == 0 ||
+                dvb_usb_device_init(intf,&artec_t1_usb2_properties,THIS_MODULE,NULL) == 0)
                 return 0;
 
         return -EINVAL;
@@ -128,10 +130,13 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
 
 /* 27 */        { USB_DEVICE(USB_VID_KWORLD,            USB_PID_KWORLD_VSTREAM_COLD) },
 
+/* 28 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,         USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+/* 29 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,         USB_PID_ULTIMA_TVBOX_USB2_WARM) },
+
 // #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
 
 #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
-/* 28 */        { USB_DEVICE(USB_VID_ANCHOR,            USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+/* 30 */        { USB_DEVICE(USB_VID_ANCHOR,            USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
 #endif
                         { }             /* Terminating entry */
 };
@@ -264,7 +269,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = {
                 },
 #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
                 {       "Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)",
-                        { &dibusb_dib3000mb_table[28], NULL },
+                        { &dibusb_dib3000mb_table[30], NULL },
                         { NULL },
                 },
 #endif
@@ -273,7 +278,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = {
 
 static struct dvb_usb_properties dibusb2_0b_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,
+        .pid_filter_count = 16,
 
         .usb_ctrl = CYPRESS_FX2,
 
@@ -321,6 +326,52 @@ static struct dvb_usb_properties dibusb2_0b_properties = {
         }
 };
 
+static struct dvb_usb_properties artec_t1_usb2_properties = {
+        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
+        .pid_filter_count = 16,
+
+        .usb_ctrl = CYPRESS_FX2,
+
+        .firmware = "dvb-usb-dibusb-6.0.0.8.fw",
+
+        .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       = dibusb2_0_power_ctrl,
+        .frontend_attach  = dibusb_dib3000mb_frontend_attach,
+        .tuner_attach     = dibusb_tuner_probe_and_attach,
+
+        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc_key_map       = dibusb_rc_keys,
+        .rc_key_map_size  = 63, /* wow, that is ugly ... I want to load it to the driver dynamically */
+        .rc_query         = dibusb_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 = {
+                {       "Artec T1 USB2.0",
+                        { &dibusb_dib3000mb_table[28], NULL },
+                        { &dibusb_dib3000mb_table[29], NULL },
+                },
+        }
+};
+
 static struct usb_driver dibusb_driver = {
         .owner          = THIS_MODULE,
         .name           = "dvb_usb_dibusb_mb",
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/dvb/dvb-usb/dibusb.h
index 6611f62977c0..2d99d05c7eab 100644
--- a/drivers/media/dvb/dvb-usb/dibusb.h
+++ b/drivers/media/dvb/dvb-usb/dibusb.h
@@ -11,7 +11,9 @@
 #ifndef _DVB_USB_DIBUSB_H_
 #define _DVB_USB_DIBUSB_H_
 
-#define DVB_USB_LOG_PREFIX "dibusb"
+#ifndef DVB_USB_LOG_PREFIX
+ #define DVB_USB_LOG_PREFIX "dibusb"
+#endif
 #include "dvb-usb.h"
 
 #include "dib3000.h"
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 0818996bf150..6be99e537e12 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -43,10 +43,14 @@
 #define USB_PID_COMPRO_DVBU2000_WARM            0xd001
 #define USB_PID_COMPRO_DVBU2000_UNK_COLD        0x010c
 #define USB_PID_COMPRO_DVBU2000_UNK_WARM        0x010d
+#define USB_PID_DIBCOM_HOOK_DEFAULT                     0x0064
+#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM      0x0065
 #define USB_PID_DIBCOM_MOD3000_COLD                     0x0bb8
 #define USB_PID_DIBCOM_MOD3000_WARM                     0x0bb9
 #define USB_PID_DIBCOM_MOD3001_COLD                     0x0bc6
 #define USB_PID_DIBCOM_MOD3001_WARM                     0x0bc7
+#define USB_PID_DIBCOM_STK7700                          0x1e14
+#define USB_PID_DIBCOM_STK7700_REENUM           0x1e15
 #define USB_PID_DIBCOM_ANCHOR_2135_COLD         0x2131
 #define USB_PID_GRANDTEC_DVBT_USB_COLD          0x0fa0
 #define USB_PID_GRANDTEC_DVBT_USB_WARM          0x0fa1
@@ -68,6 +72,7 @@
 #define USB_PID_ULTIMA_TVBOX_AN2235_WARM        0x8108
 #define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD        0x2235
 #define USB_PID_ULTIMA_TVBOX_USB2_COLD          0x8109
+#define USB_PID_ULTIMA_TVBOX_USB2_WARM          0x810a
 #define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD       0x8613
 #define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM       0x1002
 #define USB_PID_UNK_HYPER_PALTEK_COLD           0x005e
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index f5799a4c228e..36b7048c02d2 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -196,7 +196,9 @@ static int dvb_usb_allocate_stream_buffers(struct dvb_usb_device *d, int num, un
                         dvb_usb_free_stream_buffers(d);
                         return -ENOMEM;
                 }
-                deb_mem("buffer %d: %p (dma: %d)\n",d->buf_num,d->buf_list[d->buf_num],d->dma_addr[d->buf_num]);
+                deb_mem("buffer %d: %p (dma: %llu)\n",
+                        d->buf_num, d->buf_list[d->buf_num],
+                        (unsigned long long)d->dma_addr[d->buf_num]);
                 memset(d->buf_list[d->buf_num],0,size);
         }
         deb_mem("allocation successful\n");