diff -urN ttbudget_orig ttbudget_new >> diffs
Код: Выделить всё
diff -urN ttbudget_orig/dvbconfig/dvbconfig.cpp ttbudget_new/dvbconfig/dvbconfig.cpp
--- ttbudget_orig/dvbconfig/dvbconfig.cpp Sat Jun 7 10:00:37 2008
+++ ttbudget_new/dvbconfig/dvbconfig.cpp Wed Jun 25 21:27:18 2008
@@ -82,6 +82,7 @@
memset(&mac[0], 0, sizeof(mac));
/* if (argc > 1 && strncmp(argv[1], "dvb", 3) == 0)*/
+ if (argc > 1 && strncmp(argv[1], "ttdvb", 5) == 0)
{
ifnum = strtoul(argv[1]+3, NULL, 0);
diff -urN ttbudget_orig/dvbconfig/dvblib.cpp ttbudget_new/dvbconfig/dvblib.cpp
--- ttbudget_orig/dvbconfig/dvblib.cpp Sat Jun 7 10:00:37 2008
+++ ttbudget_new/dvbconfig/dvblib.cpp Wed Jun 25 21:55:30 2008
@@ -28,7 +28,8 @@
{
char name[256];
- sprintf(name, "/dev/dvb%d", ifnum);
+/* sprintf(name, "/dev/dvb%d", ifnum);*/
+ sprintf(name, "/dev/ttdvb%d", ifnum);
handle = open(name, O_RDWR);
if (handle < 0)
diff -urN ttbudget_orig/ttbudget/adapter.cpp ttbudget_new/ttbudget/adapter.cpp
--- ttbudget_orig/ttbudget/adapter.cpp Wed Jun 18 13:49:43 2008
+++ ttbudget_new/ttbudget/adapter.cpp Wed Jun 25 18:05:07 2008
@@ -273,7 +273,7 @@
case 0x1016: /* PN1010 aka S5H1420 Frontend ?, PLL TDA8260 */
tuner = new CTunerPN1010(this);
break;
-
+ case 0x0000:
case 0x1018: /* Frontend TDA10086, PLL TDA8263 */
tuner = new CTunerTDA10086(this);
break;
diff -urN ttbudget_orig/ttbudget/devio.c ttbudget_new/ttbudget/devio.c
--- ttbudget_orig/ttbudget/devio.c Fri Jun 6 15:13:54 2008
+++ ttbudget_new/ttbudget/devio.c Wed Jun 25 21:57:40 2008
@@ -39,7 +39,8 @@
.d_poll = dvb_poll,
.d_mmap = dvb_mmap,
.d_kqfilter = dvb_kqfilter,
- .d_name = "dvb"
+/* .d_name = "dvb"*/
+ .d_name = "ttdvb"
};
static void filt_dvbdetach(struct knote *kn);
diff -urN ttbudget_orig/ttbudget/netio.c ttbudget_new/ttbudget/netio.c
--- ttbudget_orig/ttbudget/netio.c Fri Jun 6 15:15:28 2008
+++ ttbudget_new/ttbudget/netio.c Wed Jun 25 21:57:49 2008
@@ -142,7 +142,8 @@
ifp->if_softc = net; //
- if_initname(ifp, "dvb", if_num ++);
+/* if_initname(ifp, "dvb", if_num ++);*/
+ if_initname(ifp, "ttdvb", if_num ++);
ifp->if_mtu = 4096;
ifp->if_flags = IFF_SIMPLEX;
diff -urN ttbudget_orig/ttbudget/ttbudget.cpp ttbudget_new/ttbudget/ttbudget.cpp
--- ttbudget_orig/ttbudget/ttbudget.cpp Wed Jun 18 13:52:22 2008
+++ ttbudget_new/ttbudget/ttbudget.cpp Wed Jun 25 18:05:35 2008
@@ -85,6 +85,7 @@
sprintf(&subdevice[60], "S-1500");
find = 1;
} break;
+ case 0x0000:
case 0x1018: {
sprintf(&subdevice[60], "S-1401");
find = 1;
на сегодня наверно все, спать пора, завтра рано вставать)))
у меня 11 вечера ужо