rpms/fmio/devel fmio-2.0.8-nodirectio.patch,1.2,1.3

[Andy Shevchenko (andriy)]

Author: andriy

Update of /cvs/extras/rpms/fmio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20617

Modified Files:
	fmio-2.0.8-nodirectio.patch 
Log Message:
Suppress in?() and out?() calls.

fmio-2.0.8-nodirectio.patch:

Index: fmio-2.0.8-nodirectio.patch
===================================================================
RCS file: /cvs/extras/rpms/fmio/devel/fmio-2.0.8-nodirectio.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fmio-2.0.8-nodirectio.patch	11 Nov 2007 23:06:28 -0000	1.2
+++ fmio-2.0.8-nodirectio.patch	11 Nov 2007 23:15:15 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up fmio-2.0.8/src/radio.c.nodirectio fmio-2.0.8/src/radio.c
---- fmio-2.0.8/src/radio.c.nodirectio	2007-11-12 00:34:14.000000000 +0200
-+++ fmio-2.0.8/src/radio.c	2007-11-12 00:42:32.000000000 +0200
+--- fmio-2.0.8/src/radio.c.nodirectio	2007-11-12 01:02:12.000000000 +0200
++++ fmio-2.0.8/src/radio.c	2007-11-12 01:02:12.000000000 +0200
 @@ -46,6 +46,7 @@
  #define MMAX(a,b)	((a) >= (b) ? (a) : (b))
  
@@ -20,8 +20,8 @@
  
  struct tuner_drv_t **drv_db;
 diff -up fmio-2.0.8/src/Makefile.nodirectio fmio-2.0.8/src/Makefile
---- fmio-2.0.8/src/Makefile.nodirectio	2007-11-12 00:34:14.000000000 +0200
-+++ fmio-2.0.8/src/Makefile	2007-11-12 00:34:14.000000000 +0200
+--- fmio-2.0.8/src/Makefile.nodirectio	2007-11-12 01:02:12.000000000 +0200
++++ fmio-2.0.8/src/Makefile	2007-11-12 01:02:12.000000000 +0200
 @@ -23,17 +23,23 @@ HDRS= bu2614.h lm700x.h pt2254a.h radio.
  ALLHDRS= $(HDRS) export.h mixer.h ostypes.h pci.h
  OBJS= access.o bu2614.o lm700x.o mixer.o pci.o pt2254a.o radio.o tc921x.o \
@@ -61,21 +61,28 @@
  fmio.0: $(MANPAGE)
  	@echo "groff -Tascii -mandoc $(MANPAGE) > $@"
 diff -up fmio-2.0.8/src/radio_drv.h.nodirectio fmio-2.0.8/src/radio_drv.h
---- fmio-2.0.8/src/radio_drv.h.nodirectio	2007-11-12 00:37:44.000000000 +0200
-+++ fmio-2.0.8/src/radio_drv.h	2007-11-12 00:36:56.000000000 +0200
-@@ -32,7 +32,9 @@
+--- fmio-2.0.8/src/radio_drv.h.nodirectio	2003-05-13 18:08:44.000000000 +0300
++++ fmio-2.0.8/src/radio_drv.h	2007-11-12 01:08:28.000000000 +0200
+@@ -32,7 +32,16 @@
  #include <sys/ioctl.h>
  
  #ifdef linux
 +#ifdef USE_DIRECT_IO
  #include <sys/io.h>
++#else
++#define inl(a)		0x00
++#define inw(a)		0x00
++#define inb(a)		0x00
++#define outl(a, b)
++#define outw(a, b)
++#define outb(a, b)
 +#endif
  #include <linux/videodev.h>
  #elif defined __FreeBSD__
  #include <machine/ioctl_bt848.h>
 diff -up fmio-2.0.8/src/access.c.nodirectio fmio-2.0.8/src/access.c
 --- fmio-2.0.8/src/access.c.nodirectio	2003-05-13 18:08:44.000000000 +0300
-+++ fmio-2.0.8/src/access.c	2007-11-12 00:49:28.000000000 +0200
++++ fmio-2.0.8/src/access.c	2007-11-12 01:02:12.000000000 +0200
 @@ -52,7 +52,7 @@ const char *radio_device_1 = "/dev/radio
  const char *radio_device_2 = "/dev/radio0";
  #endif /* linux */