summaryrefslogtreecommitdiffstats
path: root/package/lcd4linux/patches/patch-drv_generic_parport_c
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-01-20 03:19:35 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-01-20 03:19:35 +0000
commitdd024428b4f7a3d295734ffba58d4bc8893e7f11 (patch)
treedc68a778f3c049f50286aaf8aada9fed786c494c /package/lcd4linux/patches/patch-drv_generic_parport_c
parent350b643ec5b5096d260ed5c20459127203b92ae4 (diff)
sync lcd4linux with whiterussian
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3022 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/lcd4linux/patches/patch-drv_generic_parport_c')
-rw-r--r--package/lcd4linux/patches/patch-drv_generic_parport_c109
1 files changed, 0 insertions, 109 deletions
diff --git a/package/lcd4linux/patches/patch-drv_generic_parport_c b/package/lcd4linux/patches/patch-drv_generic_parport_c
deleted file mode 100644
index f029ffb17..000000000
--- a/package/lcd4linux/patches/patch-drv_generic_parport_c
+++ /dev/null
@@ -1,109 +0,0 @@
---- lcd4linux-0.10.0-RC1/drv_generic_parport.c 2005-01-06 17:54:54.000000000 +0100
-+++ lcd/drv_generic_parport.c 2005-03-20 01:20:48.052255953 +0100
-@@ -359,13 +359,12 @@
- #ifdef WITH_PPDEV
- if (PPdev) {
- ioctl (PPfd, PPDATADIR, &direction);
-- } else
-+ }
-+#else
-+ /* code stolen from linux/parport_pc.h */
-+ ctr = (ctr & ~0x20) ^ (direction?0x20:0x00);
-+ outb (ctr, Port+2);
- #endif
-- {
-- /* code stolen from linux/parport_pc.h */
-- ctr = (ctr & ~0x20) ^ (direction?0x20:0x00);
-- outb (ctr, Port+2);
-- }
- }
-
-
-@@ -383,11 +382,10 @@
- #ifdef WITH_PPDEV
- if (PPdev) {
- ioctl (PPfd, PPRSTATUS, &data);
-- } else
-+ }
-+#else
-+ data = inb (Port+1);
- #endif
-- {
-- data = inb (Port+1);
-- }
-
- /* clear unused bits */
- data &= mask;
-@@ -413,13 +411,12 @@
- frob.mask=mask;
- frob.val=val;
- ioctl (PPfd, PPFCONTROL, &frob);
-- } else
-+ }
-+#else
-+ /* code stolen from linux/parport_pc.h */
-+ ctr = (ctr & ~mask) ^ val;
-+ outb (ctr, Port+2);
- #endif
-- {
-- /* code stolen from linux/parport_pc.h */
-- ctr = (ctr & ~mask) ^ val;
-- outb (ctr, Port+2);
-- }
- }
-
-
-@@ -456,9 +453,9 @@
- frob.val = value2;
- ioctl (PPfd, PPFCONTROL, &frob);
-
-- } else
--#endif
-- {
-+ }
-+#else
-+
- /* rise */
- ctr = (ctr & ~bits) ^ value1;
- outb (ctr, Port+2);
-@@ -469,7 +466,8 @@
- /* lower */
- ctr = (ctr & ~bits) ^ value2;
- outb (ctr, Port+2);
-- }
-+
-+#endif
- }
-
-
-@@ -478,11 +476,11 @@
- #ifdef WITH_PPDEV
- if (PPdev) {
- ioctl(PPfd, PPWDATA, &data);
-- } else
-+ }
-+#else
-+ outb (data, Port);
- #endif
-- {
-- outb (data, Port);
-- }
-+
- }
-
- unsigned char drv_generic_parport_read (void)
-@@ -492,11 +490,10 @@
- #ifdef WITH_PPDEV
- if (PPdev) {
- ioctl (PPfd, PPRDATA, &data);
-- } else
-+ }
-+#else
-+ data=inb (Port);
- #endif
-- {
-- data=inb (Port);
-- }
- return data;
- }
-