From 34d7c8af2ff40e5fff7b67bfbe523e976987e92a Mon Sep 17 00:00:00 2001
From: wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 20 Mar 2005 03:37:44 +0000
Subject: add lcd4version. compiles now, but i have no clue if it will work
 with some lcd displays

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@402 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../lcd4linux/patches/patch-drv_RouterBoard_c      |  11 +++
 .../lcd4linux/patches/patch-drv_generic_parport_c  | 109 +++++++++++++++++++++
 openwrt/package/lcd4linux/patches/patch-ucdelay_h  |  11 +++
 3 files changed, 131 insertions(+)
 create mode 100644 openwrt/package/lcd4linux/patches/patch-drv_RouterBoard_c
 create mode 100644 openwrt/package/lcd4linux/patches/patch-drv_generic_parport_c
 create mode 100644 openwrt/package/lcd4linux/patches/patch-ucdelay_h

(limited to 'openwrt/package/lcd4linux/patches')

diff --git a/openwrt/package/lcd4linux/patches/patch-drv_RouterBoard_c b/openwrt/package/lcd4linux/patches/patch-drv_RouterBoard_c
new file mode 100644
index 000000000..fc9cbb43a
--- /dev/null
+++ b/openwrt/package/lcd4linux/patches/patch-drv_RouterBoard_c
@@ -0,0 +1,11 @@
+--- lcd4linux-0.10.0-RC1/drv_RouterBoard.c	2004-08-30 15:20:45.000000000 +0200
++++ lcd-patched/drv_RouterBoard.c	2005-03-19 16:03:26.849650830 +0100
+@@ -113,7 +113,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <unistd.h>
+-#include <sys/io.h>
++#include <asm/io.h>
+ 
+ #include "debug.h"
+ #include "cfg.h"
diff --git a/openwrt/package/lcd4linux/patches/patch-drv_generic_parport_c b/openwrt/package/lcd4linux/patches/patch-drv_generic_parport_c
new file mode 100644
index 000000000..f029ffb17
--- /dev/null
+++ b/openwrt/package/lcd4linux/patches/patch-drv_generic_parport_c
@@ -0,0 +1,109 @@
+--- 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;
+ }
+ 
diff --git a/openwrt/package/lcd4linux/patches/patch-ucdelay_h b/openwrt/package/lcd4linux/patches/patch-ucdelay_h
new file mode 100644
index 000000000..619594b62
--- /dev/null
+++ b/openwrt/package/lcd4linux/patches/patch-ucdelay_h
@@ -0,0 +1,11 @@
+--- lcd4linux-0.10.0-RC1/udelay.h	2004-06-26 14:05:00.000000000 +0200
++++ lcd-patched/udelay.h	2005-03-19 15:00:54.835892666 +0100
+@@ -69,7 +69,7 @@
+ /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
+ static inline void rep_nop (void)
+ {
+-  __asm__ __volatile__("rep; nop");
++  __asm__ __volatile__("nop");
+ }
+ 
+ 
-- 
cgit v1.2.3