Changeset 40595

Timestamp:

07/05/17 19:58:30 (5 years ago)

Author:

gost

Message:

[titan] mipsel fix cacc

Location:

titan/titan

Files:

• cacc.h (modified) (2 diffs)
• struct.h (modified) (1 diff)

titan/titan/cacc.h

@@ -77 +77 @@
                 d.data = data;
 
-                printf("[titan] Index CA_DATA_KEY: %d Parity: (%d) -> ", d.index, d.parity);
-                hexdump(d.data, 16);
-
-                //if (ioctl(desc_fd, CA_SET_DESCR_DATA, &d))
-                rc = ioctl(desc_fd, CA_SET_DESCR_DATA, &d);
+                printf("[titan] DESCR_DATA: -> ");
+                hexdump(data, 32);
+
+                if(checkbox("DM900") == 1 || checkbox("DM520") == 1 || checkbox("DM525") == 1 || checkbox("DM7020HD") == 1 || checkbox("DM7020HDV2") == 1)
+                        rc = ioctl(desc_fd, CA_SET_DESCR_DATA_DREAM, &d);
+                else
+                        rc = ioctl(desc_fd, CA_SET_DESCR_DATA, &d);
+                
                 if (rc)
-                        printf("###############\nERROR - CA_SET_DESCR_DATA -> CA_DATA_KEY\n###############\n");
+                        printf("[titan] #### ERROR: CA_DATA_KEY - CA_SET_DESCR_DATA index=0x%04x parity=0x%04x (errno=%d %s)\n", index, parity, errno, strerror(errno));
                 else
-                        printf("###############\nCA_SET_DESCR_DATA -> CA_DATA_KEY RCode: %i\n###############\n", rc);
-
+                        printf("[titan] #### CA_DATA_KEY - CA_SET_DESCR_DATA index=0x%04x parity=0x%04x\n", index, parity);
+                
                 d.index = index;
                 d.parity = parity;
@@ -93 +96 @@
                 d.data = data + 16;
 
-                printf("[titan] Index CA_DATA_IV: %d Parity: (%d) -> ", d.index, d.parity);
-                hexdump(d.data, 16);
-
-                //if (ioctl(desc_fd, CA_SET_DESCR_DATA, &d))
-                rc = ioctl(desc_fd, CA_SET_DESCR_DATA, &d);
+                if(checkbox("DM900") == 1 || checkbox("DM520") == 1 || checkbox("DM525") == 1 || checkbox("DM7020HD") == 1 || checkbox("DM7020HDV2") == 1)
+                        rc = ioctl(desc_fd, CA_SET_DESCR_DATA_DREAM, &d);
+                else
+                        rc = ioctl(desc_fd, CA_SET_DESCR_DATA, &d);
+                
                 if (rc)
-                        printf("###############\nERROR - CA_SET_DESCR_DATA -> CA_DATA_IV\n###############\n");
+                        printf("[titan] #### ERROR: CA_DATA_IV - CA_SET_DESCR_DATA index=0x%04x parity=0x%04x (errno=%d %s)\n", index, parity, errno, strerror(errno));
                 else
-                        printf("###############\nCA_SET_DESCR_DATA -> CA_DATA_IV RCode: %i\n###############\n", rc);
-
-        }
-        descrambler_close();
+                        printf("[titan] #### CA_DATA_IV - CA_SET_DESCR_DATA index=0x%04x parity=0x%04x\n", index, parity);      
+        }
+        //descrambler_close();
+
 #else
+        
         index |= 0x100;
-        if (descrambler_open())
+        
+        if(desc_fd == -1)
+                descrambler_open();
+        if (desc_fd > 0)
         {
                 d.index = index;

titan/titan/struct.h

@@ -209 +209 @@
 #define MAX_ELEMENTS    33
 #ifdef MIPSEL
-#define CA_SET_DESCR_DATA _IOW('o', 137, struct ca_descr_data)
+#define CA_SET_DESCR_DATA_DREAM _IOW('o', 137, struct ca_descr_data)
+#define CA_SET_DESCR_DATA _IOW('o', 10, struct ca_descr_data)
 #endif
 #ifdef SH4NEW