bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/lcd4linux: update to r1187

Browse Source 
Add support for the following drivers:
ASTUSB, DPF, EFN, FutabaVFD, FW8888,
mda166a, SamsungSPF (broken), TeakLCM

Refresh patches and drop 120-remove_parport_outb.patch
which was fixed upstream.

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@31648 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jmccrohan 2012-05-08 02:03:14 +00:00
parent f90214ebbd
commit 5949a2e0ea
6 changed files with 83 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
utils/lcd4linux/Config.in
View File

@ -3,6 +3,9 @@ if PACKAGE_lcd4linux-custom
config LCD4LINUX_CUSTOM_NEEDS_libdbus
bool
config LCD4LINUX_CUSTOM_NEEDS_libdpf
bool
#config LCD4LINUX_CUSTOM_NEEDS_libftdi
# bool
@ -12,6 +15,9 @@ config LCD4LINUX_CUSTOM_NEEDS_libgd
config LCD4LINUX_CUSTOM_NEEDS_libiconv
bool
config LCD4LINUX_CUSTOM_NEEDS_libjpeg
bool
config LCD4LINUX_CUSTOM_NEEDS_libmpdclient
bool
@ -51,6 +57,10 @@ config LCD4LINUX_CUSTOM_NEEDS_st2205tool
comment "Drivers ---"
config LCD4LINUX_CUSTOM_DRIVER_ASTUSB
bool
prompt "ASTUSB"
config LCD4LINUX_CUSTOM_DRIVER_BeckmannEgle
bool
prompt "BeckmannEgle"
@ -77,11 +87,28 @@ config LCD4LINUX_CUSTOM_DRIVER_D4D
bool
prompt "D4D"
config LCD4LINUX_CUSTOM_DRIVER_dpf
bool
prompt "dpf"
select LCD4LINUX_CUSTOM_NEEDS_libdpf
config LCD4LINUX_CUSTOM_DRIVER_EA232graphic
bool
prompt "EA232graphic"
select LCD4LINUX_CUSTOM_NEEDS_libgd
config LCD4LINUX_CUSTOM_DRIVER_EFN
bool
prompt "EFN"
config LCD4LINUX_CUSTOM_DRIVER_FutabaVFD
bool
prompt "FutabaVFD"
config LCD4LINUX_CUSTOM_DRIVER_FW8888
bool
prompt "FW8888"
config LCD4LINUX_CUSTOM_DRIVER_G15
bool
prompt "G15"
@ -157,6 +184,10 @@ config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbitalGX
select LCD4LINUX_CUSTOM_NEEDS_libgd
select LCD4LINUX_CUSTOM_NEEDS_libusb
config LCD4LINUX_CUSTOM_DRIVER_mdm166a
bool
prompt "mdm166a"
config LCD4LINUX_CUSTOM_DRIVER_MilfordInstruments
bool
prompt "MilfordInstruments"
@ -214,6 +245,11 @@ config LCD4LINUX_CUSTOM_DRIVER_RouterBoard
prompt "RouterBoard"
depends on TARGET_rb532
config LCD4LINUX_CUSTOM_DRIVER_SamsungSPF
bool
prompt "SamsungSPF"
select LCD4LINUX_CUSTOM_NEEDS_libjpeg
config LCD4LINUX_CUSTOM_DRIVER_serdisplib
bool
prompt "serdisplib"
@ -240,6 +276,10 @@ config LCD4LINUX_CUSTOM_DRIVER_T6963
prompt "T6963"
select LCD4LINUX_CUSTOM_NEEDS_libgd
config LCD4LINUX_CUSTOM_DRIVER_TeakLCM
bool
prompt "TeakLCM"
config LCD4LINUX_CUSTOM_DRIVER_TEW673GRU
bool
select LCD4LINUX_CUSTOM_NEEDS_libgd

15
utils/lcd4linux/Makefile
View File

@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=lcd4linux
PKG_REV:=1159
PKG_REV:=1187
PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=5
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/
@ -19,13 +19,18 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=svn
LCD4LINUX_DRIVERS:= \
ASTUSB \
BeckmannEgle \
BWCT \
CrystalFontz \
Curses \
Cwlinux \
D4D \
DPF \
EA232graphic \
EFN \
FutabaVFD \
FW8888 \
G15 \
GLCD2USB \
IRLCD \
@ -41,6 +46,7 @@ LCD4LINUX_DRIVERS:= \
M50530 \
MatrixOrbital \
MatrixOrbitalGX \
mda166a \
MilfordInstruments \
Newhaven \
Noritake \
@ -53,11 +59,13 @@ LCD4LINUX_DRIVERS:= \
PNG \
PPM \
$(if $(CONFIG_TARGET_rb532),RouterBoard) \
$(if $(CONFIG_BROKEN),SamsungSPF) \
serdisplib \
ShuttleVFD \
SimpleLCD \
st2205 \
T6963 \
TeakLCM \
$(if $(CONFIG_TARGET_ar71xx),TEW673GRU) \
Trefon \
USBHUB \
@ -154,8 +162,10 @@ define Package/lcd4linux-custom
$(call Package/lcd4linux/Default)
DEPENDS:= \
+LCD4LINUX_CUSTOM_NEEDS_libdbus:libdbus \
+LCD4LINUX_CUSTOM_NEEDS_libdpf:libdpf \
+LCD4LINUX_CUSTOM_NEEDS_libgd:libgd \
$(if $(ICONV_FULL),+LCD4LINUX_CUSTOM_NEEDS_libiconv:libiconv-full) \
+LCD4LINUX_CUSTOM_NEEDS_libjpeg:libjpeg \
+LCD4LINUX_CUSTOM_NEEDS_libmpdclient:libmpdclient \
+LCD4LINUX_CUSTOM_NEEDS_libmysqlclient:libmysqlclient \
+LCD4LINUX_CUSTOM_NEEDS_libncurses:libncurses \
@ -187,6 +197,7 @@ define Package/lcd4linux-full
$(call Package/lcd4linux/Default)
DEPENDS:= @DEVEL \
+libdbus \
+libdpf \
+libgd \
$(if $(ICONV_FULL),+libiconv-full) \
+libmpdclient \

31
utils/lcd4linux/patches/120-remove_parport_outb.patch
View File

@ -1,31 +0,0 @@
--- a/drv_generic_parport.c
+++ b/drv_generic_parport.c
@@ -39,16 +39,6 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
-#ifdef HAVE_SYS_IO_H
-#include <sys/io.h>
-#define WITH_OUTB
-#else
-#ifdef HAVE_ASM_IO_H
-#include <asm/io.h>
-#define WITH_OUTB
-#endif
-#endif
-
#if defined (HAVE_LINUX_PARPORT_H) && defined (HAVE_LINUX_PPDEV_H)
#define WITH_PPDEV
#include <linux/parport.h>
@@ -68,6 +58,11 @@
/* these signals are inverted by hardware on the parallel port */
#define PARPORT_CONTROL_INVERTED (PARPORT_CONTROL_STROBE | PARPORT_CONTROL_SELECT | PARPORT_CONTROL_AUTOFD)
+#ifndef WITH_OUTB
+#define inb(foo) 0
+#define outb(foo,bar) 0
+#endif
+
#if !defined(WITH_OUTB) && !defined(WITH_PPDEV)
#error neither outb() nor ppdev() possible
#error cannot compile parallel port driver

8
utils/lcd4linux/patches/140-no_repnop_T6963.patch
View File

@ -4,9 +4,9 @@
/* wait for STA0=1 and STA1=1 */
n = 0;
do {
+#if 0
+#if 0
rep_nop();
+#endif
+#endif
if (++n > 1000) {
debug("hang in status1");
bug = 1;
@ -14,9 +14,9 @@
/* wait for STA3=1 */
n = 0;
do {
+#if 0
+#if 0
rep_nop();
+#endif
+#endif
if (++n > 1000) {
debug("hang in status2");
bug = 1;

102
utils/lcd4linux/patches/170-add-generic-spidev-driver.patch
View File

@ -160,18 +160,6 @@
+#endif /* _DRV_GENERIC_SPIDEV_H_ */
--- a/drivers.m4
+++ b/drivers.m4
@@ -232,9 +232,9 @@ for driver in $drivers; do
serdisplib)
SERDISPLIB=$val;
;;
- ShuttleVFD)
+ ShuttleVFD)
SHUTTLEVFD=$val
- ;;
+ ;;
SimpleLCD)
SIMPLELCD=$val
;;
@@ -285,6 +285,7 @@ PARPORT="no"
SERIAL="no"
I2C="no"
@ -180,82 +168,8 @@
# generic libraries
LIBUSB="no"
@@ -544,17 +545,17 @@ if test "$MATRIXORBITALGX" = "yes"; then
fi
fi
-if test "$MDM166A" = "yes"; then
- if test "$has_usb10" = "true"; then
+if test "$MDM166A" = "yes"; then
+ if test "$has_usb10" = "true"; then
GRAPHIC="yes"
- DRIVERS="$DRIVERS drv_mdm166a.o"
- GPIO="yes"
+ DRIVERS="$DRIVERS drv_mdm166a.o"
+ GPIO="yes"
LIBUSB10="yes"
- AC_DEFINE(WITH_MDM166A,1,[MDM166A driver])
- else
- AC_MSG_WARN(libusb-1.0/libusb.h not found: MDM166A driver disabled)
- fi
-fi
+ AC_DEFINE(WITH_MDM166A,1,[MDM166A driver])
+ else
+ AC_MSG_WARN(libusb-1.0/libusb.h not found: MDM166A driver disabled)
+ fi
+fi
if test "$MILINST" = "yes"; then
TEXT="yes"
@@ -630,7 +631,7 @@ if test "$PICOLCDGRAPHIC" = "yes"; then
if test "$has_usb" = "true"; then
TEXT="yes"
GRAPHIC="yes"
- KEYPAD="yes"
+ KEYPAD="yes"
GPIO="yes"
SERIAL="yes"
LIBUSB="yes"
@@ -698,17 +699,17 @@ if test "$SERDISPLIB" = "yes"; then
fi
fi
-if test "$SHUTTLEVFD" = "yes"; then
- if test "$has_usb" = "true"; then
- TEXT="yes"
- GPIO="yes"
- DRIVERS="$DRIVERS drv_ShuttleVFD.o"
- LIBUSB="yes"
- AC_DEFINE(WITH_SHUTTLEVFD,1,[ShuttleVFD driver])
- else
- AC_MSG_WARN(usb.h not found: ShuttleVFD driver disabled)
- fi
-fi
+if test "$SHUTTLEVFD" = "yes"; then
+ if test "$has_usb" = "true"; then
+ TEXT="yes"
+ GPIO="yes"
+ DRIVERS="$DRIVERS drv_ShuttleVFD.o"
+ LIBUSB="yes"
+ AC_DEFINE(WITH_SHUTTLEVFD,1,[ShuttleVFD driver])
+ else
+ AC_MSG_WARN(usb.h not found: ShuttleVFD driver disabled)
+ fi
+fi
if test "$SIMPLELCD" = "yes"; then
TEXT="yes"
@@ -786,7 +787,7 @@ fi
if test "$VNC" = "yes"; then
if test "$has_vncserverlib" = "true"; then
GRAPHIC="yes"
- KEYPAD="yes"
+ KEYPAD="yes"
DRIVERS="$DRIVERS drv_vnc.o"
DRVLIBS="$DRVLIBS -L/usr/local/lib -lvncserver -lz"
AC_DEFINE(WITH_VNC,1,[vnc driver])
@@ -874,6 +875,12 @@ if test "$KEYPAD" = "yes"; then
DRIVERS="$DRIVERS drv_generic_keypad.o"
@@ -940,6 +941,12 @@ if test "$LIBJPEG" = "yes"; then
DRVLIBS="$DRVLIBS -ljpeg"
fi
+# generic spidev driver
@ -267,18 +181,10 @@
# libusb
if test "$LIBUSB" = "yes"; then
DRVLIBS="$DRVLIBS -lusb"
@@ -892,6 +899,6 @@ fi
if test "$DRIVERS" = ""; then
AC_MSG_ERROR([You should include at least one driver...])
fi
-
+
AC_SUBST(DRIVERS)
AC_SUBST(DRVLIBS)
--- a/configure.in
+++ b/configure.in
@@ -108,6 +108,9 @@ fi
#AC_CHECK_HEADERS(asm/io.h)
@@ -118,6 +118,9 @@ AC_ARG_WITH(outb,
AC_CHECK_HEADERS([asm/io.h] [linux/parport.h linux/ppdev.h], [has_parport="true"], [has_parport="false"])
+# check for spidev

45
utils/lcd4linux/patches/172-add-TEW673GRU-driver.patch
View File

@ -1,25 +1,25 @@
--- a/drivers.m4
+++ b/drivers.m4
@@ -38,7 +38,7 @@ AC_ARG_WITH(
[ LW_ABP, M50530, MatrixOrbital, MatrixOrbitalGX, MilfordInstruments, MDM166A,]
@@ -39,7 +39,7 @@ AC_ARG_WITH(
[ Newhaven, Noritake, NULL, Pertelian, PHAnderson,]
[ PICGraphic, picoLCD, picoLCDGraphic, PNG, PPM, RouterBoard,]
- [ Sample, serdisplib, ShuttleVFD, SimpleLCD, st2205, T6963,]
+ [ Sample, serdisplib, ShuttleVFD, SimpleLCD, st2205, T6963, TEW673GRU]
[ Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11],
[ Sample, SamsungSPF, serdisplib, ShuttleVFD, SimpleLCD, st2205, T6963,]
- [ TeakLCM, Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11],
+ [ TeakLCM, TEW673GRU, Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11],
drivers=$withval,
drivers=all
@@ -104,6 +104,7 @@ for driver in $drivers; do
)
@@ -107,6 +107,7 @@ for driver in $drivers; do
SHUTTLEVFD="yes"
SIMPLELCD="yes"
T6963="yes"
+ TEW673GRU="yes"
TeakLCM="yes"
Trefon="yes"
ULA200="yes"
USBHUB="yes"
@@ -244,6 +245,9 @@ for driver in $drivers; do
T6963)
T6963=$val
@@ -260,6 +261,9 @@ for driver in $drivers; do
TeakLCM)
TeakLCM=$val
;;
+ TEW673GRU)
+ TEW673GRU=$val
@ -27,8 +27,8 @@
Trefon)
Trefon=$val
;;
@@ -740,6 +744,18 @@ if test "$T6963" = "yes"; then
fi
@@ -800,6 +804,18 @@ if test "$TeakLCM" = "yes"; then
AC_DEFINE(WITH_TEAK_LCM,1,[TeakLCM driver])
fi
+if test "$TEW673GRU" = "yes"; then
@ -48,17 +48,17 @@
TEXT="yes"
--- a/drv.c
+++ b/drv.c
@@ -89,6 +89,7 @@ extern DRIVER drv_serdisplib;
@@ -92,6 +92,7 @@ extern DRIVER drv_serdisplib;
extern DRIVER drv_ShuttleVFD;
extern DRIVER drv_SimpleLCD;
extern DRIVER drv_T6963;
+extern DRIVER drv_TEW673GRU;
extern DRIVER drv_TeakLCM;
extern DRIVER drv_Trefon;
extern DRIVER drv_ula200;
extern DRIVER drv_USBHUB;
@@ -232,6 +233,9 @@ DRIVER *Driver[] = {
#ifdef WITH_T6963
&drv_T6963,
@@ -248,6 +249,9 @@ DRIVER *Driver[] = {
#ifdef WITH_TEAK_LCM
&drv_TeakLCM,
#endif
+#ifdef WITH_TEW673GRU
+ &drv_TEW673GRU,
@ -68,10 +68,10 @@
#endif
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,6 +115,7 @@ drv_serdisplib.c \
drv_ShuttleVFD.c \
@@ -117,6 +117,7 @@ drv_ShuttleVFD.c \
drv_SimpleLCD.c \
drv_T6963.c \
drv_TeakLCM.c \
+drv_TEW673GRU.c \
drv_Trefon.c \
drv_ula200.c \
@ -538,8 +538,8 @@
+};
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -547,6 +547,12 @@ Display VNC {
HttpPort '5800'
@@ -571,6 +571,11 @@ Display FutabaVFD {
}
}
+Display TEW673GRU {
@ -547,7 +547,6 @@
+ Font '6x8'
+ Port '/dev/spidev1.0'
+}
+
#Plugin KVV {
# StationID '12_701'
# Refresh 30