Changeset 6609

Timestamp:

04/16/12 08:42:52 (11 years ago)

Author:

corsair

Message:

fixed some compiler warnings

Location:

trunk

Files:

• csctapi/icc_async.c (modified) (1 diff)
• csctapi/ifd_sc8in1.c (modified) (5 diffs)
• csctapi/ifd_sc8in1.h (modified) (1 diff)
• module-dvbapi.c (modified) (1 diff)

trunk/csctapi/icc_async.c

@@ -102 +102 @@
                 cs_debug_mask(D_DEVICE, "ICC_Async_Device_Init opening SC8in1");
                 //open physical device
-                unsigned char deviceName[128];
+                char deviceName[128];
                 strncpy(deviceName, reader->device, 128);
                 deviceName[pos] = 0;

trunk/csctapi/ifd_sc8in1.c

@@ -34 +34 @@
 static int32_t mcrReadStatus(struct s_reader *reader, unsigned char *status);
 static int32_t sc8in1ReadStatus(struct s_reader *reader, unsigned char *status);
-int32_t Sc8in1_SetBaudrate (struct s_reader * reader, uint32_t baudrate, struct termios *termio, uint8_t cmdMode);
 int32_t Sc8in1_NeedBaudrateChange(struct s_reader * reader, uint32_t desiredBaudrate, struct termios *current, struct termios *new, uint8_t cmdMode);
 static int32_t sc8in1_tcdrain(struct s_reader *reader);
@@ -41 +40 @@
 
 static int32_t sc8in1_command(struct s_reader * reader, unsigned char * buff,
-        uint16_t lenwrite, uint16_t lenread, uint8_t enableEepromWrite, unsigned char getStatusMode,
+        uint16_t lenwrite, uint16_t lenread, uint8_t enableEepromWrite, unsigned char UNUSED(getStatusMode),
         uint8_t selectSlotMode) {
     struct termios termio, termiobackup;
@@ -108 +107 @@
     // write cmd
     cs_ddump_mask(D_DEVICE, buff, lenwrite, "IO: Sending: ");
-    uint32_t dataWritten = 0, dataToWrite = lenwrite;
+    int32_t dataWritten = 0, dataToWrite = lenwrite;
     while (dataWritten < lenwrite) {
-        uint32_t written = write(reader->handle, buff, dataToWrite);
+        int32_t written = write(reader->handle, buff, dataToWrite);
         if (written == -1) {
             cs_log("SC8in1 Command write error");
@@ -384 +383 @@
 static int32_t mcrHelloOscam(struct s_reader *reader) {
     // Display "OSCam" on MCR display
-    unsigned char helloOscam[5] = {'O', 'S', 'C', 'a', 'm'};
+    char helloOscam[5] = {'O', 'S', 'C', 'a', 'm'};
     return MCR_DisplayText(reader, &helloOscam[0], 5, 100, 1);
 }
@@ -594 +593 @@
     int32_t i, speed, retval;
     uint16_t sc8in1_clock = 0;
-    unsigned char buff[3];
+    //unsigned char buff[3];
 
     Sc8in1_DebugSignals(reader, reader->slot, "I-1");

trunk/csctapi/ifd_sc8in1.h

@@ -24 +24 @@
 int32_t Sc8in1_InitLocks(struct s_reader * reader);
 int32_t MCR_DisplayText(struct s_reader *reader, char* text, uint16_t text_len, uint16_t time, uint8_t blocking);
+int32_t Sc8in1_SetBaudrate (struct s_reader * reader, uint32_t baudrate, struct termios *termio, uint8_t cmdMode);

trunk/module-dvbapi.c

@@ -1234 +1234 @@
     if (dvbapi_priority) {
         struct s_dvbapi_priority *mapentry;
-        for (j = 0; j < demux[demux_id].ECMpidcount; j++) {
+        for (j = 0; (int32_t)j < demux[demux_id].ECMpidcount; j++) {
             mapentry = dvbapi_check_prio_match(demux_id, j, 'm');
             if (mapentry) {