Author: pebender
Date: Sun Oct 26 17:37:38 2008
New Revision: 3873
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-imon_lcd_dynamic.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-imon_module_param.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-no_python.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-remove_gpio.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-remove_smp_unsafe_drivers.patch
Removed:
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4-imon_lcd_dynamic.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4-imon_module_param.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4-no_python.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4-remove_gpio.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4-remove_smp_unsafe_drivers.patch
Log:
- Added files missing from the LIRC update commit.
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-imon_lcd_dynamic.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-imon_lcd_dynamic.patch
Sun Oct 26 17:37:38 2008
@@ -0,0 +1,74 @@
+diff -Naur lirc-0.8.4a-old/drivers/lirc_imon/lirc_imon.c
lirc-0.8.4a-new/drivers/lirc_imon/lirc_imon.c
+--- lirc-0.8.4a-old/drivers/lirc_imon/lirc_imon.c 2008-10-26
14:16:48.000000000 -0700
++++ lirc-0.8.4a-new/drivers/lirc_imon/lirc_imon.c 2008-10-26
14:17:16.000000000 -0700
+@@ -123,8 +123,12 @@
+ static ssize_t vfd_write(struct file *file, const char *buf,
+ size_t n_bytes, loff_t *pos);
+
+-/* LCD file_operations override function prototypes */
+-static ssize_t lcd_write(struct file *file, const char *buf,
++/* VFD display */
++static ssize_t vfd_write_vfd(struct file *file, const char *buf,
++ size_t n_bytes, loff_t *pos);
++
++/* LCD display */
++static ssize_t vfd_write_lcd(struct file *file, const char *buf,
+ size_t n_bytes, loff_t *pos);
+
+ /* LIRC plugin function prototypes */
+@@ -618,6 +622,23 @@
+ #endif
+
+
++/**
++ * Writes data to the VFD.
++ */
++static ssize_t vfd_write(struct file *file, const char *buf,
++ size_t n_bytes, loff_t *pos)
++{
++ /**
++ * We SHOULD detect this now, rather than just doing whatever our module
++ * parameters tells us...
++ */
++ if (is_lcd) {
++ return vfd_write_lcd(file, buf, n_bytes, pos);
++ } else {
++ return vfd_write_vfd(file, buf, n_bytes, pos);
++ }
++}
++
+
+ /**
+ * Writes data to the VFD. The IMON VFD is 2x16 characters
+@@ -630,7 +651,7 @@
+ * than 32 bytes are provided spaces will be appended to
+ * generate a full screen.
+ */
+-static ssize_t vfd_write(struct file *file, const char *buf,
++static ssize_t vfd_write_vfd(struct file *file, const char *buf,
+ size_t n_bytes, loff_t *pos)
+ {
+ int i;
+@@ -717,7 +738,7 @@
+ * display whatever diacritics you need, and so on), but it's also
+ * a lot more complicated than most LCDs...
+ */
+-static ssize_t lcd_write(struct file *file, const char *buf,
++static ssize_t vfd_write_lcd(struct file *file, const char *buf,
+ size_t n_bytes, loff_t *pos)
+ {
+ int retval = SUCCESS;
+@@ -1090,13 +1111,6 @@
+
+ info("%s: found IMON device", __FUNCTION__);
+
+- /*
+- * If it's the LCD, as opposed to the VFD, we just need to replace
+- * the "write" file op.
+- */
+- if (is_lcd)
+- vfd_fops.write = &lcd_write;
+-
+ #if !defined(KERNEL_2_5)
+ for (subminor = 0; subminor < MAX_DEVICES; ++subminor) {
+ if (minor_table[subminor] == NULL)
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-imon_module_param.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-imon_module_param.patch
Sun Oct 26 17:37:38 2008
@@ -0,0 +1,36 @@
+diff -Naur lirc-0.8.4a-old/drivers/lirc_imon/lirc_imon.c
lirc-0.8.4a-new/drivers/lirc_imon/lirc_imon.c
+--- lirc-0.8.4a-old/drivers/lirc_imon/lirc_imon.c 2008-10-26
14:15:48.000000000 -0700
++++ lirc-0.8.4a-new/drivers/lirc_imon/lirc_imon.c 2008-10-26
14:16:48.000000000 -0700
+@@ -258,11 +258,11 @@
+ /* to prevent races between open() and disconnect() */
+ static DECLARE_MUTEX(disconnect_sem);
+
+-static int debug;
++static int debug = 0;
+ #ifdef LIRC_IMON_LCD
+ static int is_lcd = 1;
+ #else
+-static int is_lcd; /* If LIRC_IMON_LCD not defined, default to non-LCD */
++static int is_lcd = 0; /* If LIRC_IMON_LCD not defined, default to
non-LCD */
+ #endif
+
+ #if !defined(KERNEL_2_5)
+@@ -291,15 +291,15 @@
+ MODULE_LICENSE("GPL");
+ MODULE_DEVICE_TABLE(usb, imon_usb_id_table);
+
+-module_param(debug, int, 0);
++module_param(debug, int, 0644);
+ MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)");
+
+ #ifdef LIRC_IMON_LCD
+-module_param(is_lcd, int, 1);
++module_param(is_lcd, int, 0644);
+ MODULE_PARM_DESC(is_lcd, "The device is an LCD: 0=no (it's a VFD), "
+ "1=yes (default:yes)");
+ #else
+-module_param(is_lcd, int, 0);
++module_param(is_lcd, int, 0644);
+ MODULE_PARM_DESC(is_lcd, "The device is an LCD: 0=no (it's a VFD), "
+ "1=yes (default:no)");
+ #endif
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-no_python.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-no_python.patch
Sun Oct 26 17:37:38 2008
@@ -0,0 +1,14 @@
+diff -Naur lirc-0.8.4a-old/configure.ac lirc-0.8.4a-new/configure.ac
+--- lirc-0.8.4a-old/configure.ac 2008-10-26 07:11:30.000000000 -0700
++++ lirc-0.8.4a-new/configure.ac 2008-10-26 14:16:00.000000000 -0700
+@@ -22,8 +22,8 @@
+ AC_PATH_PROG(LIBUSB_CONFIG, libusb-config)
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL
+-AM_PATH_PYTHON
+-AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
++AM_PATH_PYTHON(,,[:])
++AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-remove_gpio.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-remove_gpio.patch
Sun Oct 26 17:37:38 2008
@@ -0,0 +1,201 @@
+diff -Naur lirc-0.8.4a-old/configure.ac lirc-0.8.4a-new/configure.ac
+--- lirc-0.8.4a-old/configure.ac 2008-10-26 14:17:42.000000000 -0700
++++ lirc-0.8.4a-new/configure.ac 2008-10-26 14:18:10.000000000 -0700
+@@ -159,7 +159,6 @@
+ (lirc_dev lirc_atiusb) \
+ (lirc_dev lirc_bt829) \
+ (lirc_dev commandir lirc_cmdir) \
+- (lirc_dev lirc_gpio) \
+ (lirc_dev lirc_i2c) \
+ (lirc_dev lirc_igorplugusb) \
+ (lirc_dev lirc_ttusbir) \
+@@ -419,9 +418,8 @@
+ all, none, userspace, accent, act200l,
+ act220l, adaptec, alsa_usb, animax, asusdh,
+ atilibusb, atiusb, audio, audio_alsa
+- avermedia, avermedia_vdomate, avermedia98,
+- bestbuy, bestbuy2, breakoutbox, bte, bw6130,
+- caraca, chronos, cmdir, commandir, comX, cph06x,
++ breakoutbox, bte, bw6130,
++ cmdir, commandir, comX,
+ creative, creative_infracd, devinput,
+ digimatrix, dsp, dvico, ea65, exaudio,
+ flyvideo, gvbctv5pci, hauppauge,
+@@ -430,13 +428,13 @@
+ imon_24g, imon_knob, imon_lcd, imon_pad,
+ imon_rsc, irdeo, irdeo_remote, irlink,
+ irman, irreal, it87, ite8709, knc_one, kworld,
+- leadtek_0007, leadtek_0010, leadtek_pvr2000,
++ leadtek_pvr2000,
+ livedrive_midi, livedrive_seq, logitech,
+ lptX, macmini, mceusb, mceusb2, mediafocusI,
+ mouseremote, mouseremote_ps2, mp3anywhere,
+ mplay, nslu2,packard_bell, pcmak,
+ pcmak_usb, pctv, pixelview_bt878,
+- pixelview_pak, pixelview_pro, provideo,
++ provideo,
+ realmagic, remotemaster, sa1100, samsung,
+ sasem, sb0540, serial, silitek, sir, slinke,
+ streamzap, tekram, tekram_bt829, tira,
+@@ -564,9 +562,6 @@
+ ;;
+ lirc_dev-commandir-lirc_cmdir)
+ ;;
+- lirc_dev-lirc_gpio)
+- #lirc_driver="${lirc_driver} lirc_dev lirc_gpio"
+- ;;
+ lirc_dev-lirc_i2c)
+ #lirc_driver="${lirc_driver} lirc_dev lirc_i2c"
+ ;;
+@@ -592,8 +587,6 @@
+ ;;
+ lirc_dev-lirc_streamzap)
+ ;;
+- lirc_flyvideo)
+- ;;
+ livedrive_midi)
+ hw_module="${hw_module} hw_livedrive_common.o
hw_livedrive_midi.o"
+ ;;
+@@ -750,36 +743,6 @@
+ alsa_lib=-lasound
+ fi
+
+-if test "$driver" = "avermedia"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="avermedia/lircd.conf.avermedia"
+- lircmd_conf="avermedia/lircmd.conf.avermedia"
+-fi
+-
+-if test "$driver" = "avermedia98"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="avermedia/lircd.conf.avermedia98"
+- lircmd_conf="avermedia/lircmd.conf.avermedia98"
+-fi
+-
+-if test "$driver" = "avermedia_vdomate"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="avermedia/lircd.conf.vdomate"
+-# lircmd_conf="avermedia/lircmd.conf.vdomate"
+-fi
+-
+-if test "$driver" = "bestbuy"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="bestbuy/lircd.conf.bestbuy"
+- lircmd_conf="bestbuy/lircmd.conf.bestbuy"
+-fi
+-
+-if test "$driver" = "bestbuy2"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="bestbuy/lircd.conf.bestbuy2"
+- lircmd_conf="bestbuy/lircmd.conf.bestbuy2"
+-fi
+-
+ if test "$driver" = "breakoutbox"; then
+ lirc_driver="lirc_dev lirc_i2c"
+ lircd_conf="creative/lircd.conf.breakoutbox"
+@@ -810,12 +773,6 @@
+ # lircmd_conf="caraca/lircmd.conf.caraca"
+ fi
+
+-if test "$driver" = "chronos"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="chronos/lircd.conf.chronos"
+-# lircmd_conf="chronos/lircmd.conf.chronos"
+-fi
+-
+ if test "$driver" = "cmdir"; then
+ lirc_driver="lirc_dev commandir lirc_cmdir"
+ fi
+@@ -856,12 +813,6 @@
+ fi
+ fi
+
+-if test "$driver" = "cph03x" -o "$driver" = "cph06x"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="cph03x/lircd.conf.cph03x"
+-# lircmd_conf="cph03x/lircmd.conf.cph03x"
+-fi
+-
+ if test "$driver" = "creative"; then
+ lirc_driver="none"
+ hw_module="hw_creative.o serial.o"
+@@ -917,18 +868,6 @@
+ # lircmd_conf="creative/lircmd.conf.exaudio"
+ fi
+
+-if test "$driver" = "flyvideo"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="life-view/lircd.conf.flyvideo"
+- lircmd_conf="life-view/lircmd.conf.flyvideo"
+-fi
+-
+-if test "$driver" = "gvbctv5pci"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="iodata/lircd.conf.gvbctv5pci"
+-# lircmd_conf="iodata/lircmd.conf.gvbctv5pci"
+-fi
+-
+ if test "$driver" = "hauppauge"; then
+ lirc_driver="lirc_dev lirc_i2c"
+ lircd_conf="hauppauge/lircd.conf.hauppauge"
+@@ -1044,24 +983,6 @@
+ # lircmd_conf="knc_one/lircmd.conf.knc_one"
+ fi
+
+-if test "$driver" = "kworld"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="kworld/lircd.conf.kworld"
+-# lircmd_conf="kworld/lircmd.conf.kworld"
+-fi
+-
+-if test "$driver" = "leadtek_0007"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="leadtek/lircd.conf.RM-0007"
+- lircmd_conf="leadtek/lircmd.conf.RM-0007"
+-fi
+-
+-if test "$driver" = "leadtek_0010"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="leadtek/lircd.conf.RM-0010"
+- lircmd_conf="leadtek/lircmd.conf.RM-0010"
+-fi
+-
+ if test "$driver" = "leadtek_pvr2000"; then
+ lirc_driver="lirc_dev lirc_i2c"
+ lircd_conf="leadtek/lircd.conf.PVR2000"
+@@ -1177,19 +1098,6 @@
+ # lircmd_conf="pixelview/lircmd.conf.pixelview_bt878"
+ fi
+
+-if test "$driver" = "pixelview_pak"; then
+- lirc_driver="lirc_dev lirc_gpio"
+-# the config files are the same as for the PlayTV pro
+- lircd_conf="pixelview/lircd.conf.playtv_pro"
+- lircmd_conf="pixelview/lircmd.conf.playtv_pro"
+-fi
+-
+-if test "$driver" = "pixelview_pro"; then
+- lirc_driver="lirc_dev lirc_gpio"
+- lircd_conf="pixelview/lircd.conf.playtv_pro"
+- lircmd_conf="pixelview/lircmd.conf.playtv_pro"
+-fi
+-
+ if test "$driver" = "provideo"; then
+ lirc_driver="lirc_dev lirc_i2c"
+ lircd_conf="provideo/lircd.conf.pv951"
+@@ -1439,7 +1347,6 @@
+ lirc_atiusb \
+ lirc_bt829 \
+ lirc_cmdir \
+- lirc_gpio \
+ lirc_i2c \
+ lirc_igorplugusb \
+ lirc_imon \
+@@ -1710,7 +1617,6 @@
+ drivers/lirc_bt829/Makefile
+ drivers/lirc_cmdir/Makefile
+ drivers/lirc_dev/Makefile
+- drivers/lirc_gpio/Makefile
+ drivers/lirc_i2c/Makefile
+ drivers/lirc_igorplugusb/Makefile
+ drivers/lirc_ttusbir/Makefile
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-remove_smp_unsafe_drivers.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.4a-remove_smp_unsafe_drivers.patch
Sun Oct 26 17:37:38 2008
@@ -0,0 +1,106 @@
+diff -Naur lirc-0.8.4a-old/configure.ac lirc-0.8.4a-new/configure.ac
+--- lirc-0.8.4a-old/configure.ac 2008-10-26 14:17:04.000000000 -0700
++++ lirc-0.8.4a-new/configure.ac 2008-10-26 14:17:42.000000000 -0700
+@@ -168,7 +168,6 @@
+ (lirc_dev lirc_ite8709) \
+ (lirc_dev lirc_mceusb) \
+ (lirc_dev lirc_mceusb2) \
+- (lirc_dev lirc_parallel) \
+ (lirc_dev lirc_sasem) \
+ (lirc_dev lirc_serial) \
+ (lirc_dev lirc_sir) \
+@@ -298,9 +297,6 @@
+ AH_TEMPLATE([LIRC_IMON_LCD],
+ [Define if your iMON is an LCD and not a VFD.])
+
+-AH_TEMPLATE([LIRC_TIMER],
+- [Set the timer for the parallel port driver])
+-
+ AH_TEMPLATE([LOCALSTATEDIR],
+ [modifiable single-machine data])
+
+@@ -438,7 +434,7 @@
+ livedrive_midi, livedrive_seq, logitech,
+ lptX, macmini, mceusb, mceusb2, mediafocusI,
+ mouseremote, mouseremote_ps2, mp3anywhere,
+- mplay, nslu2,packard_bell, parallel, pcmak,
++ mplay, nslu2,packard_bell, pcmak,
+ pcmak_usb, pctv, pixelview_bt878,
+ pixelview_pak, pixelview_pro, provideo,
+ realmagic, remotemaster, sa1100, samsung,
+@@ -588,8 +584,6 @@
+ ;;
+ lirc_dev-lirc_mceusb2)
+ ;;
+- lirc_dev-lirc_parallel)
+- ;;
+ lirc_dev-lirc_sasem)
+ ;;
+ lirc_dev-lirc_serial)
+@@ -1098,18 +1092,6 @@
+ lircmd_conf="logitech/lircmd.conf.logitech"
+ fi
+
+-if test "$driver" = "lpt1"; then
+- lirc_driver="lirc_dev lirc_parallel"
+- port=0x378
+- irq=7
+-fi
+-
+-if test "$driver" = "lpt2"; then
+- lirc_driver="lirc_dev lirc_parallel"
+- port=0x278
+- irq=5
+-fi
+-
+ if test "$driver" = "macmini"; then
+ lirc_driver="$driver"
+ hw_module="hw_hiddev.o"
+@@ -1173,10 +1155,6 @@
+ lircd_conf="packard_bell/lircd.conf.packard_bell"
+ fi
+
+-if test "$driver" = "parallel"; then
+- lirc_driver="lirc_dev lirc_parallel"
+-fi
+-
+ if test "$driver" = "pcmak" -o "$driver" = "pcmak_usb"; then
+ lirc_driver="none"
+ hw_module="hw_pcmak.o serial.o"
+@@ -1469,7 +1447,6 @@
+ lirc_ite8709 \
+ lirc_mceusb \
+ lirc_mceusb2 \
+- lirc_parallel \
+ lirc_sasem \
+ lirc_serial \
+ lirc_sir \
+@@ -1539,10 +1516,6 @@
+ irq=${withval}
+ )
+
+-AC_ARG_WITH(timer,
+-[ --with-timer=value specify the timer value for the parallel
driver],
+-timer=${withval})
+-
+ dnl I dont think libirman will accept this at the moment
+ AC_ARG_WITH(tty,
+ [ --with-tty=file specify the tty to use (Irman, RemoteMaster,
etc.)],
+@@ -1673,9 +1646,6 @@
+ if test "$irq" != ""; then
+ AC_DEFINE_UNQUOTED(LIRC_IRQ, $irq)
+ fi
+-if test "$timer" != ""; then
+- AC_DEFINE_UNQUOTED(LIRC_TIMER, $timer)
+-fi
+ AC_DEFINE_UNQUOTED(LIRC_IRTTY, "$irtty")
+ AC_DEFINE_UNQUOTED(LIRC_SYSLOG, $facility)
+
+@@ -1749,7 +1719,6 @@
+ drivers/lirc_ite8709/Makefile
+ drivers/lirc_mceusb/Makefile
+ drivers/lirc_mceusb2/Makefile
+- drivers/lirc_parallel/Makefile
+ drivers/lirc_sasem/Makefile
+ drivers/lirc_serial/Makefile
+ drivers/lirc_sir/Makefile
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
