Merge branch 'bkl-removal' into next

[pandora-kernel.git] / drivers / media / video / dabusb.c

diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index ff4b238..48f4b92 100644 (file)
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -37,11 +37,11 @@
 #include <asm/atomic.h>
 #include <linux/delay.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
+#include <linux/firmware.h>
+#include <linux/ihex.h>
 
 #include "dabusb.h"
-#include "dabfirmware.h"
 
 /*
  * Version Information
@@ -206,7 +206,7 @@ static void dabusb_iso_complete (struct urb *purb)
 /*-------------------------------------------------------------------*/
 static int dabusb_alloc_buffers (pdabusb_t s)
 {
-       int buffers = 0;
+       int transfer_len = 0;
        pbuff_t b;
        unsigned int pipe = usb_rcvisocpipe (s->usbdev, _DABUSB_ISOPIPE);
        int pipesize = usb_maxpacket (s->usbdev, pipe, usb_pipeout (pipe));
@@ -217,7 +217,7 @@ static int dabusb_alloc_buffers (pdabusb_t s)
        dbg("dabusb_alloc_buffers pipesize:%d packets:%d transfer_buffer_len:%d",
                 pipesize, packets, transfer_buffer_length);
 
-       while (buffers < (s->total_buffer_size << 10)) {
+       while (transfer_len < (s->total_buffer_size << 10)) {
                b = kzalloc(sizeof (buff_t), GFP_KERNEL);
                if (!b) {
                        err("kzalloc(sizeof(buff_t))==NULL");
@@ -252,10 +252,10 @@ static int dabusb_alloc_buffers (pdabusb_t s)
                        b->purb->iso_frame_desc[i].length = pipesize;
                }
 
-               buffers += transfer_buffer_length;
+               transfer_len += transfer_buffer_length;
                list_add_tail (&b->buff_list, &s->free_buff_list);
        }
-       s->got_mem = buffers;
+       s->got_mem = transfer_len;
 
        return 0;
 
@@ -298,7 +298,8 @@ static int dabusb_bulk (pdabusb_t s, pbulk_transfer_t pb)
        return ret;
 }
 /* --------------------------------------------------------------------- */
-static int dabusb_writemem (pdabusb_t s, int pos, unsigned char *data, int len)
+static int dabusb_writemem (pdabusb_t s, int pos, const unsigned char *data,
+                           int len)
 {
        int ret;
        unsigned char *transfer_buffer =  kmalloc (len, GFP_KERNEL);
@@ -325,24 +326,35 @@ static int dabusb_8051_reset (pdabusb_t s, unsigned char reset_bit)
 static int dabusb_loadmem (pdabusb_t s, const char *fname)
 {
        int ret;
-       PINTEL_HEX_RECORD ptr = firmware;
+       const struct ihex_binrec *rec;
+       const struct firmware *fw;
 
        dbg("Enter dabusb_loadmem (internal)");
 
+       ret = request_ihex_firmware(&fw, "dabusb/firmware.fw", &s->usbdev->dev);
+       if (ret) {
+               err("Failed to load \"dabusb/firmware.fw\": %d\n", ret);
+               goto out;
+       }
        ret = dabusb_8051_reset (s, 1);
-       while (ptr->Type == 0) {
 
-               dbg("dabusb_writemem: %04X %p %d)", ptr->Address, ptr->Data, ptr->Length);
+       for (rec = (const struct ihex_binrec *)fw->data; rec;
+            rec = ihex_next_binrec(rec)) {
+               dbg("dabusb_writemem: %04X %p %d)", be32_to_cpu(rec->addr),
+                   rec->data, be16_to_cpu(rec->len));
 
-               ret = dabusb_writemem (s, ptr->Address, ptr->Data, ptr->Length);
+               ret = dabusb_writemem(s, be32_to_cpu(rec->addr), rec->data,
+                                      be16_to_cpu(rec->len));
                if (ret < 0) {
-                       err("dabusb_writemem failed (%d %04X %p %d)", ret, ptr->Address, ptr->Data, ptr->Length);
+                       err("dabusb_writemem failed (%d %04X %p %d)", ret,
+                           be32_to_cpu(rec->addr), rec->data,
+                           be16_to_cpu(rec->len));
                        break;
                }
-               ptr++;
        }
        ret = dabusb_8051_reset (s, 0);
-
+       release_firmware(fw);
+ out:
        dbg("dabusb_loadmem: exit");
 
        return ret;
@@ -377,9 +389,9 @@ static int dabusb_fpga_init (pdabusb_t s, pbulk_transfer_t b)
 static int dabusb_fpga_download (pdabusb_t s, const char *fname)
 {
        pbulk_transfer_t b = kmalloc (sizeof (bulk_transfer_t), GFP_KERNEL);
+       const struct firmware *fw;
        unsigned int blen, n;
        int ret;
-       unsigned char *buf = bitstream;
 
        dbg("Enter dabusb_fpga_download (internal)");
 
@@ -388,10 +400,16 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname)
                return -ENOMEM;
        }
 
+       ret = request_firmware(&fw, "dabusb/bitstream.bin", &s->usbdev->dev);
+       if (ret) {
+               err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret);
+               return ret;
+       }
+
        b->pipe = 1;
        ret = dabusb_fpga_clear (s, b);
        mdelay (10);
-       blen = buf[73] + (buf[72] << 8);
+       blen = fw->data[73] + (fw->data[72] << 8);
 
        dbg("Bitstream len: %i", blen);
 
@@ -403,7 +421,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname)
        for (n = 0; n <= blen + 60; n += 60) {
                // some cclks for startup
                b->size = 64;
-               memcpy (b->data + 4, buf + 74 + n, 60);
+               memcpy (b->data + 4, fw->data + 74 + n, 60);
                ret = dabusb_bulk (s, b);
                if (ret < 0) {
                        err("dabusb_bulk failed.");
@@ -414,6 +432,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname)
 
        ret = dabusb_fpga_init (s, b);
        kfree (b);
+       release_firmware(fw);
 
        dbg("exit dabusb_fpga_download");