V4L/DVB: s2255drv: fixes for big endian arch

s2255drv fixes for big endian architecture

Signed-off-by: Dean Anderson <dean@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 25 insertions, 30 deletions

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index a9c53335fd8f..882a79679dc6 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -78,11 +78,11 @@
 #define S2255_SETMODE_TIMEOUT   500
 #define S2255_VIDSTATUS_TIMEOUT 350
 #define MAX_CHANNELS            4
-#define S2255_MARKER_FRAME      0x2255DA4AL
-#define S2255_MARKER_RESPONSE   0x2255ACACL
-#define S2255_RESPONSE_SETMODE  0x01
-#define S2255_RESPONSE_FW       0x10
-#define S2255_RESPONSE_STATUS   0x20
+#define S2255_MARKER_FRAME      cpu_to_le32(0x2255DA4AL)
+#define S2255_MARKER_RESPONSE   cpu_to_le32(0x2255ACACL)
+#define S2255_RESPONSE_SETMODE  cpu_to_le32(0x01)
+#define S2255_RESPONSE_FW       cpu_to_le32(0x10)
+#define S2255_RESPONSE_STATUS   cpu_to_le32(0x20)
 #define S2255_USB_XFER_SIZE     (16 * 1024)
 #define MAX_CHANNELS            4
 #define MAX_PIPE_BUFFERS        1
@@ -141,12 +141,12 @@
 #define DEF_HUE         0
 
 /* usb config commands */
-#define IN_DATA_TOKEN   0x2255c0de
-#define CMD_2255        0xc2255000
-#define CMD_SET_MODE    (CMD_2255 | 0x10)
-#define CMD_START       (CMD_2255 | 0x20)
-#define CMD_STOP        (CMD_2255 | 0x30)
-#define CMD_STATUS      (CMD_2255 | 0x40)
+#define IN_DATA_TOKEN   cpu_to_le32(0x2255c0de)
+#define CMD_2255        cpu_to_le32(0xc2255000)
+#define CMD_SET_MODE    cpu_to_le32((CMD_2255 | 0x10))
+#define CMD_START       cpu_to_le32((CMD_2255 | 0x20))
+#define CMD_STOP        cpu_to_le32((CMD_2255 | 0x30))
+#define CMD_STATUS      cpu_to_le32((CMD_2255 | 0x40))
 
 struct s2255_mode {
         u32 format;     /* input video format (NTSC, PAL) */
@@ -310,7 +310,7 @@ struct s2255_fh {
 /* Need DSP version 5+ for video status feature */
 #define S2255_MIN_DSP_STATUS    5
 #define S2255_MAJOR_VERSION     1
-#define S2255_MINOR_VERSION     15
+#define S2255_MINOR_VERSION     16
 #define S2255_RELEASE           0
 #define S2255_VERSION           KERNEL_VERSION(S2255_MAJOR_VERSION, \
                                                S2255_MINOR_VERSION, \
@@ -1219,9 +1219,8 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
                           struct s2255_mode *mode)
 {
         int res;
-        u32 *buffer;
+        __le32 *buffer;
         unsigned long chn_rev;
-
         mutex_lock(&dev->lock);
         chn_rev = G_chnmap[chn];
         dprintk(3, "mode scale [%ld] %p %d\n", chn, mode, mode->scale);
@@ -1247,7 +1246,7 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
 
         /* set the mode */
         buffer[0] = IN_DATA_TOKEN;
-        buffer[1] = (u32) chn_rev;
+        buffer[1] = (__le32) cpu_to_le32(chn_rev);
         buffer[2] = CMD_SET_MODE;
         memcpy(&buffer[3], &dev->mode[chn], sizeof(struct s2255_mode));
         dev->setmode_ready[chn] = 0;
@@ -1278,7 +1277,7 @@ static int s2255_cmd_status(struct s2255_dev *dev, unsigned long chn,
                             u32 *pstatus)
 {
         int res;
-        u32 *buffer;
+        __le32 *buffer;
         u32 chn_rev;
         mutex_lock(&dev->lock);
         chn_rev = G_chnmap[chn];
@@ -1291,7 +1290,7 @@ static int s2255_cmd_status(struct s2255_dev *dev, unsigned long chn,
         }
         /* form the get vid status command */
         buffer[0] = IN_DATA_TOKEN;
-        buffer[1] = chn_rev;
+        buffer[1] = (__le32) cpu_to_le32(chn_rev);
         buffer[2] = CMD_STATUS;
         *pstatus = 0;
         dev->vidstatus_ready[chn] = 0;
@@ -1971,14 +1970,14 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
         if (frm->ulState == S2255_READ_IDLE) {
                 int jj;
                 unsigned int cc;
-                s32 *pdword;
+                __le32 *pdword; /*data from dsp is little endian */
                 int payload;
                 /* search for marker codes */
                 pdata = (unsigned char *)pipe_info->transfer_buffer;
+                pdword = (__le32 *)pdata;
                 for (jj = 0; jj < (pipe_info->cur_transfer_size - 12); jj++) {
-                        switch (*(s32 *) pdata) {
+                        switch (*pdword) {
                         case S2255_MARKER_FRAME:
-                                pdword = (s32 *)pdata;
                                 dprintk(4, "found frame marker at offset:"
                                         " %d [%x %x]\n", jj, pdata[0],
                                         pdata[1]);
@@ -2002,7 +2001,6 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
                                 dev->jpg_size[dev->cc] = pdword[4];
                                 break;
                         case S2255_MARKER_RESPONSE:
-                                pdword = (s32 *)pdata;
                                 pdata += DEF_USB_BLOCK;
                                 jj += DEF_USB_BLOCK;
                                 if (pdword[1] >= MAX_CHANNELS)
@@ -2437,9 +2435,9 @@ static int s2255_start_acquire(struct s2255_dev *dev, unsigned long chn)
         }
 
         /* send the start command */
-        *(u32 *) buffer = IN_DATA_TOKEN;
-        *((u32 *) buffer + 1) = (u32) chn_rev;
-        *((u32 *) buffer + 2) = (u32) CMD_START;
+        *(__le32 *) buffer = IN_DATA_TOKEN;
+        *((__le32 *) buffer + 1) = (__le32) cpu_to_le32(chn_rev);
+        *((__le32 *) buffer + 2) = CMD_START;
         res = s2255_write_config(dev->udev, (unsigned char *)buffer, 512);
         if (res != 0)
                 dev_err(&dev->udev->dev, "CMD_START error\n");
@@ -2454,24 +2452,21 @@ static int s2255_stop_acquire(struct s2255_dev *dev, unsigned long chn)
         unsigned char *buffer;
         int res;
         unsigned long chn_rev;
-
         if (chn >= MAX_CHANNELS) {
                 dprintk(2, "stop acquire failed, bad channel %lu\n", chn);
                 return -1;
         }
         chn_rev = G_chnmap[chn];
-
         buffer = kzalloc(512, GFP_KERNEL);
         if (buffer == NULL) {
                 dev_err(&dev->udev->dev, "out of mem\n");
                 return -ENOMEM;
         }
-
         /* send the stop command */
         dprintk(4, "stop acquire %lu\n", chn);
-        *(u32 *) buffer = IN_DATA_TOKEN;
-        *((u32 *) buffer + 1) = (u32) chn_rev;
-        *((u32 *) buffer + 2) = CMD_STOP;
+        *(__le32 *) buffer = IN_DATA_TOKEN;
+        *((__le32 *) buffer + 1) = (__le32) cpu_to_le32(chn_rev);
+        *((__le32 *) buffer + 2) = CMD_STOP;
         res = s2255_write_config(dev->udev, (unsigned char *)buffer, 512);
 
         if (res != 0)