Changeset 1898
- Timestamp:
- 03/25/10 22:57:17 (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r1822 r1898 47 47 set (OSCamOperatingSystem "Amino") 48 48 set (CS_OS_HW "amino") 49 set (CS_OS_SYS "linux") 50 elseif (OSCAM_SYSTEM_NAME MATCHES "QboxHD") 51 set (OSCamOperatingSystem "QboxHD") 52 set (CS_OS_HW "qboxhd") 49 53 set (CS_OS_SYS "linux") 50 54 else (OSCAM_SYSTEM_NAME MATCHES "Tuxbox") … … 129 133 add_definitions ("-DOS_LINUX -DSH4 -DTUXBOX") 130 134 set (DEFAULT_CS_CONFDIR "/usr/local/etc") 135 elseif (OSCamOperatingSystem MATCHES "QboxHD") 136 add_definitions ("-DOS_LINUX -DSH4 -DQBOXHD -DTUXBOX") 137 set (DEFAULT_CS_CONFDIR "/var/tuxbox/config") 131 138 elseif (OSCamOperatingSystem MATCHES "Windows/Cygwin") 132 139 add_definitions ("-DOS_CYGWIN32 -static") … … 371 378 elseif (OSCamOperatingSystem MATCHES "WRT54G") 372 379 elseif (OSCamOperatingSystem MATCHES "Amino") 380 elseif (OSCamOperatingSystem MATCHES "QboxHD") 373 381 elseif (OSCamOperatingSystem MATCHES "Windows/cygwin") 374 382 elseif (OSCamOperatingSystem MATCHES "NeutrinoHD") -
trunk/module-dvbapi.c
r1894 r1898 786 786 } 787 787 788 #if 0788 #ifdef QBOXHD 789 789 time_t pmt_timestamp=0; 790 790 int pmt_id=-1, dir_fd=-1; … … 792 792 void event_handler(int signal) { 793 793 struct stat pmt_info; 794 uchar inhalt[ 200], dest[200];795 int len;794 uchar inhalt[400], dest[200]; 795 uint len; 796 796 signal=signal; 797 797 int pmt_fd = open("/tmp/pmt.tmp", O_RDONLY); … … 799 799 if (fstat(pmt_fd, &pmt_info) == 0) { 800 800 if (pmt_info.st_mtime == pmt_timestamp) { 801 close(pmt_fd); 801 802 return; 802 803 } … … 813 814 814 815 cs_sleepms(100); 815 //02 B0 <len> <srvid1> <srvid2> .. 816 816 817 len = read(pmt_fd,inhalt,sizeof(inhalt)); 817 818 if (len<1) return; 818 819 #ifdef QBOXHD 820 uint j1,j2; 821 // QboxHD pmt.tmp is the full capmt written as a string of hex values 822 // pmt.tmp must be longer than 3 bytes (6 hex chars) and even length 823 if ((len<6) || ((len%2) != 0)) { 824 cs_log("dvbapi: error parsing QboxHD pmt.tmp, incorrect length"); 825 return; 826 } 827 828 for(j2=0,j1=0;j2<len;j2+=2,j1++) { 829 if (sscanf((char*)inhalt+j2,"%02X",(uint*)dest+j1) != 1) { 830 cs_log("dvbapi: error parsing QboxHD pmt.tmp, data not valid in position %d",j2); 831 return; 832 } 833 } 834 835 cs_ddump(dest,len/2,"QboxHD pmt.tmp:"); 836 837 pmt_id = dvbapi_parse_capmt(dest+4, (len/2)-4, -1); 838 #else 819 839 cs_ddump(inhalt,len,"pmt:"); 820 840 … … 828 848 829 849 pmt_id = dvbapi_parse_capmt(dest, 7 + len - 12 - 4, -1); 850 #endif 830 851 close(pmt_fd); 831 852 } … … 880 901 } 881 902 882 #if 0903 #ifdef QBOXHD 883 904 int pmt_fd = open("/tmp/pmt.tmp", O_RDONLY); 884 905 if(pmt_fd>0) { … … 962 983 963 984 if (type[i]==1) { 964 if (pfd2[i].fd==listenfd) { 985 if (pfd2[i].fd==listenfd) { 986 cs_debug("dvbapi: new socket connection"); 965 987 connfd = accept(listenfd, (struct sockaddr *)&servaddr, (socklen_t *)&clilen); 966 cs_debug("dvbapi: new socket connection %d", connfd);967 988 968 989 if (connfd <= 0) { … … 986 1007 cs_log("dvbapi: New capmt on old socket. Please report."); 987 1008 len = read(pfd2[i].fd, mbuf, sizeof(mbuf)); 988 cs_dump(mbuf, len, "message:"); 1009 cs_dump(mbuf, len, "message:"); 989 1010 } 990 1011 } else { // type==0 -
trunk/oscam-config.h
r1760 r1898 13 13 # endif 14 14 # define CS_EMBEDDED 15 # define CS_NOSHM 15 # ifndef QBOXHD 16 # define CS_NOSHM 17 # endif 16 18 # define NO_FTIME 17 19 # define CS_HW_DBOX2 1
Note:
See TracChangeset
for help on using the changeset viewer.