Changeset 22550

Timestamp:

07/27/13 10:57:33 (10 years ago)

Author:

nit

Message:

fix

Location:

titan/titan

Files:

• scconfig.h (modified) (3 diffs)
• scdev.h (modified) (2 diffs)

titan/titan/scconfig.h

@@ -16 +16 @@
 
 start:
+        i = 0;
         dvbnode = dvbdev;
         tmp = NULL;
@@ -34 +35 @@
                                 
                                 uint32_t status = 0;
+                                dvbnode->fd = scopendirect(dvbnode->dev);
                                 scgetiscardpresent(dvbnode, &status);
+                                scclose(dvbnode, -1);
                                 
                                 if(status == 1)
@@ -63 +66 @@
                 {
                         clearscreen(scconfig);
-                        scsetreset(((struct dvbdev*)listbox->select->handle));
-                        drawscreen(load, 0, 0);
-                        sleep(1);
-                        clearscreen(load);
+                        struct dvbdev *dvbtmp = ((struct dvbdev*)listbox->select->handle);
+                        if(dvbtmp != NULL)
+                        {
+                                drawscreen(load, 0, 0);
+                                dvbtmp->fd = scopendirect(dvbtmp->dev);
+                                scsetreset(dvbtmp);
+                                scclose(dvbtmp, -1);
+                                clearscreen(load);
+                        }
                         drawscreen(scconfig, 0, 0);
                 }

titan/titan/scdev.h

@@ -374 +374 @@
 {
         debug(1000, "in");
-        int i, y, fd = -1, count = 0;
+        int y, fd = -1, count = 0;
         char *buf = NULL, *scdev = NULL;
 
@@ -391 +391 @@
         }
 
-        for(i = 0; i < MAXDVBADAPTER; i++)
-        {
-                for(y = 0; y < MAXSCDEV; y++)
+        for(y = 0; y < MAXSCDEV; y++)
+        {
+                sprintf(buf, scdev, y);
+                fd = scopendirect(buf);
+                if(fd >= 0)
                 {
-                        sprintf(buf, scdev, i, y);
-                        fd = scopendirect(buf);
-                        if(fd >= 0)
-                        {
-                                scclose(NULL, fd);
-                                count++;
-                                adddvbdev(buf, i, y, -1, SCDEV, NULL, NULL, 0);
-                        }
+                        scclose(NULL, fd);
+                        count++;
+                        adddvbdev(buf, 0, y, -1, SCDEV, NULL, NULL, 0);
                 }
         }