[Redbutton-devel] SF.net SVN: redbutton: [152] redbutton-download/trunk

[<ski...@us...>]

Revision: 152
          http://svn.sourceforge.net/redbutton/?rev=152&view=rev
Author:   skilvington
Date:     2006-11-07 08:40:18 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
allow compiling on Dreambox (define HAVE_DREAMBOX_HARDWARE), patch from Lorenzo Pallara

Modified Paths:
--------------
    redbutton-download/trunk/biop.c
    redbutton-download/trunk/table.c
    redbutton-download/trunk/utils.h

Modified: redbutton-download/trunk/biop.c
===================================================================
--- redbutton-download/trunk/biop.c	2006-11-07 15:07:56 UTC (rev 151)
+++ redbutton-download/trunk/biop.c	2006-11-07 16:40:18 UTC (rev 152)
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
+#include <arpa/inet.h>
 
 #include "biop.h"
 #include "fs.h"

Modified: redbutton-download/trunk/table.c
===================================================================
--- redbutton-download/trunk/table.c	2006-11-07 15:07:56 UTC (rev 151)
+++ redbutton-download/trunk/table.c	2006-11-07 16:40:18 UTC (rev 152)
@@ -30,7 +30,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+
+#if defined(HAVE_DREAMBOX_HARDWARE)
+#include <ost/dmx.h>
+#define dmx_sct_filter_params dmxSctFilterParams
+#else
 #include <linux/dvb/dmx.h>
+#endif
 
 #include "dsmcc.h"
 #include "carousel.h"

Modified: redbutton-download/trunk/utils.h
===================================================================
--- redbutton-download/trunk/utils.h	2006-11-07 15:07:56 UTC (rev 151)
+++ redbutton-download/trunk/utils.h	2006-11-07 16:40:18 UTC (rev 152)
@@ -32,10 +32,18 @@
 #endif
 
 /* DVB demux device - %u is card number */
+#if defined(HAVE_DREAMBOX_HARDWARE)
+#define DEMUX_DEVICE "/dev/dvb/card%u/demux0"
+#else
 #define DEMUX_DEVICE  "/dev/dvb/adapter%u/demux0"
+#endif
 
 /* DVB dvr device - %u is card number */
+#if defined(HAVE_DREAMBOX_HARDWARE)
+#define DVR_DEVICE "/dev/dvb/card%u/dvr0"
+#else
 #define DVR_DEVICE  "/dev/dvb/adapter%u/dvr0"
+#endif
 
 char *skip_ws(char *);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.