Author: pebender
Date: Sat Dec 27 14:59:29 2008
New Revision: 4134
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-event.rules.disabled
Removed:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-kbd.rules.disabled
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-mouse.rules.disabled
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xorg.conf
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_X
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/x
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Combined keyboard and mouse udev detection rules into event detection
rule.
- Added wiimote to detected event devices.
- Added support for numerous event devices in xorg.conf rather than just
one keyboard and one mouse.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sat Dec 27
14:59:29 2008
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 62 (2008-12-24):
+Changes since 62 (2008-12-27):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -14,6 +14,13 @@
Modified MiniMyth configuration
- Obsoleted MM_WIIMOTE_ENABLED.
+
+Modified Xorg
+ - Combined keyboard and mouse udev detection rules into event detection
+ rule.
+ - Added wiimote to detected event devices.
+ - Added support for numerous event devices in xorg.conf rather than
just
+ one keyboard and one mouse.
Modified mediaplayers
- Modified init so that it configures MythTV to use xv rather than
vdpau
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xorg.conf
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xorg.conf
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xorg.conf
Sat Dec 27 14:59:29 2008
@@ -28,17 +28,7 @@
Load "record"
EndSection
-...@kbd_true@Section "InputDevice"
-...@kbd_true@ Identifier "Keyboard1"
-...@kbd_true@ Driver "evdev"
-...@kbd_true@ Option "Device" "@MM_X_KBD_DEVICE@"
-...@kbd_true@EndSection
-
-...@mouse_true@Section "InputDevice"
-...@mouse_true@ Identifier "Mouse1"
-...@mouse_true@ Driver "evdev"
-...@mouse_true@ Option "Device" "@MM_X_MOUSE_DEVICE@"
-...@mouse_true@EndSection
+...@inputdevice_event@
Section "Monitor"
Identifier "Monitor1"
@@ -136,8 +126,7 @@
Section "ServerLayout"
Identifier "Layout1"
Screen "Screen1"
-...@kbd_true@ InputDevice "Keyboard1" "CoreKeyboard"
-...@mouse_true@ InputDevice "Mouse1" "CorePointer"
+ @SERVERLAYOUT_EVENT@
EndSection
Section "DRI"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_X
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_X
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_X
Sat Dec 27 14:59:29 2008
@@ -206,83 +206,6 @@
# The routine relies on MM_VIDEO_* variables.
conf_default_MM_VIDEO
- # X device variables
- if /usr/bin/test -z "${MM_X_KBD_DEVICE}" ; then
- MM_X_KBD_DEVICE='auto'
- fi
- if /usr/bin/test "${MM_X_KBD_DEVICE}" = 'auto' ; then
- MM_X_KBD_DEVICE="`mm_detect_state_get 'kbd' | mm_uniq`"
- device_list=
- for device in ${MM_X_KBD_DEVICE} ; do
- if /usr/bin/test -e "${device}" ; then
- device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
- fi
- device_list="${device_list} ${device}"
- done
- MM_X_KBD_DEVICE="${device_list}"
-
- if /usr/bin/test -n "${MM_LIRC_DEVICE_LIST}" ; then
- device_blacklist=
- for device_item in ${MM_LIRC_DEVICE_LIST} ; do
- device=`/bin/echo "${device_item}" | /usr/bin/cut -d ','
-f 1`
- if /usr/bin/test -e "${device}" ; then
- device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
- fi
- device_blacklist="${device_blacklist} ${device}"
- done
- device_list=
- for device in ${MM_X_KBD_DEVICE} ; do
- if ! /bin/echo " ${device_blacklist} " | /bin/grep -q "
${device} " ; then
- device_list="${device_list} ${device}"
- fi
- done
- MM_X_KBD_DEVICE="${device_list}"
- fi
- MM_X_KBD_DEVICE=`/bin/echo "${MM_X_KBD_DEVICE}" | /bin/sed -e 's%
*% %g' -e 's%^ %%' -e 's% $%%'`
- MM_X_KBD_DEVICE=`/bin/echo "${MM_X_KBD_DEVICE}" | /usr/bin/cut
-d ' ' -f 1`
- fi
- if /usr/bin/test "${MM_X_KBD_DEVICE}" = 'none' ; then
- MM_X_KBD_DEVICE=''
- fi
-
- if /usr/bin/test -z "${MM_X_MOUSE_DEVICE}" ; then
- MM_X_MOUSE_DEVICE='auto'
- fi
- if /usr/bin/test "${MM_X_MOUSE_DEVICE}" = 'auto' ; then
- MM_X_MOUSE_DEVICE="`mm_detect_state_get 'mouse' | mm_uniq`"
- device_list=
- for device in ${MM_X_MOUSE_DEVICE} ; do
- if /usr/bin/test -e "${device}" ; then
- device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
- fi
- device_list="${device_list} ${device}"
- done
- MM_X_MOUSE_DEVICE="${device_list}"
-
- if /usr/bin/test -n "${MM_LIRC_DEVICE_LIST}" ; then
- device_blacklist=
- for device_item in ${MM_LIRC_DEVICE_LIST} ; do
- device=`/bin/echo "${device_item}" | /usr/bin/cut -d ','
-f 1`
- if /usr/bin/test -e "${device}" ; then
- device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
- fi
- device_blacklist="${device_blacklist} ${device}"
- done
- device_list=
- for device in ${MM_X_MOUSE_DEVICE} ; do
- if ! /bin/echo " ${device_blacklist} " | /bin/grep -q "
${device} " ; then
- device_list="${device_list} ${device}"
- fi
- done
- MM_X_MOUSE_DEVICE="${device_list}"
- fi
- MM_X_MOUSE_DEVICE=`/bin/echo "${MM_X_MOUSE_DEVICE}" | /bin/sed
-e 's% *% %g' -e 's%^ %%' -e 's% $%%'`
- MM_X_MOUSE_DEVICE=`/bin/echo "${MM_X_MOUSE_DEVICE}" | /usr/bin/cut
-d ' ' -f 1`
- fi
- if /usr/bin/test "${MM_X_MOUSE_DEVICE}" = 'none' ; then
- MM_X_MOUSE_DEVICE=''
- fi
-
# X driver variables.
if /usr/bin/test -z "${MM_X_DRIVER}" ; then
MM_X_DRIVER=`mm_detect_state_get 'video' | /usr/bin/cut -d ' ' -f
1 | /usr/bin/cut -d ',' -f 1`
@@ -831,9 +754,6 @@
conf_write_MM_X() {
local conf_file=$1
-
- conf_variable_write "${conf_file}"
MM_X_KBD_DEVICE "${MM_X_KBD_DEVICE}"
- conf_variable_write "${conf_file}"
MM_X_MOUSE_DEVICE "${MM_X_MOUSE_DEVICE}"
conf_variable_write "${conf_file}"
MM_X_DRIVER "${MM_X_DRIVER}"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
Sat Dec 27 14:59:29 2008
@@ -103,6 +103,8 @@
MM_X_DISPLAYSIZE_X
MM_X_DISPLAYSIZE_Y
MM_X_DVI_ENABLED
+MM_X_KBD_DEVICE
+MM_X_MOUSE_DEVICE
MM_X_RESOLUTION_X
MM_X_RESOLUTION_Y
MM_X_SCREENSAVER_ENABLED
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/x
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/x
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/x
Sat Dec 27 14:59:29 2008
@@ -3,6 +3,7 @@
# x
################################################################################
. /etc/rc.d.sh/functions
+. /lib/minimyth/mm_detect
start() {
@@ -18,6 +19,14 @@
local NVIDIA_TRUE
local KBD_TRUE
local MOUSE_TRUE
+ local EVENT_DEVICE_LIST
+ local INPUTDEVICE_EVENT
+ local SERVERLAYOUT_EVENT
+ local identifier
+ local device
+ local device_blacklist
+ local device_item
+ local device_list
mm_message_output info "configuring X ..."
@@ -205,6 +214,49 @@
/usr/bin/test -n "${MM_X_MODE_1}" && MM_X_MODE_1="\"${MM_X_MODE_1}\""
/usr/bin/test -n "${MM_X_MODE_2}" && MM_X_MODE_2="\"${MM_X_MODE_2}\""
+ device_list=
+ for device_item in `mm_detect_state_get 'event' | mm_uniq` ; do
+ device=`/bin/echo "${device_item}" | /usr/bin/cut -d ',' -f 1`
+ if /usr/bin/test -e "${device}" ; then
+ device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
+ fi
+ device_list="${device_list} ${device}"
+ done
+ EVENT_DEVICE_LIST="${device_list}"
+
+ if /usr/bin/test -n "${MM_LIRC_DEVICE_LIST}" ; then
+ device_blacklist=
+ for device_item in ${MM_LIRC_DEVICE_LIST} ; do
+ device=`/bin/echo "${device_item}" | /usr/bin/cut -d ',' -f 1`
+ if /usr/bin/test -e "${device}" ; then
+ device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
+ fi
+ device_blacklist="${device_blacklist} ${device}"
+ done
+ device_list=
+ for device in ${EVENT_DEVICE_LIST} ; do
+ if ! /bin/echo " ${device_blacklist} " | /bin/grep -q "
${device} " ; then
+ device_list="${device_list} ${device}"
+ fi
+ done
+ EVENT_DEVICE_LIST="${device_list}"
+ fi
+
+ INPUTDEVICE_EVENT=''
+ SERVERLAYOUT_EVENT=''
+ if /usr/bin/test -n "${EVENT_DEVICE_LIST}" ; then
+ for device in ${EVENT_DEVICE_LIST} ; do
+ identifier=`/bin/echo ${device} | /bin/sed -e 's%.*/%%'`
+ INPUTDEVICE_EVENT="${INPUTDEVICE_EVENT}\nSection
\"InputDevice\""
+ INPUTDEVICE_EVENT="${INPUTDEVICE_EVENT}\n Identifier
\"${identifier}\""
+ INPUTDEVICE_EVENT="${INPUTDEVICE_EVENT}\n Driver
\"evdev\""
+ INPUTDEVICE_EVENT="${INPUTDEVICE_EVENT}\n Option
\"Device\" \"${device}\""
+ INPUTDEVICE_EVENT="${INPUTDEVICE_EVENT}\nEndSection"
+
+ SERVERLAYOUT_EVENT="${SERVERLAYOUT_EVENT}\n InputDevice
\"${identifier}\" \"SendCoreEvents\""
+ done
+ fi
+
KBD_TRUE='#'
if /usr/bin/test -n "${MM_X_KBD_DEVICE}" ; then
KBD_TRUE=''
@@ -214,10 +266,8 @@
MOUSE_TRUE=''
fi
- /bin/sed -i "s...@kbd_true@%${KBD_TRUE}%"
/etc/X11/xorg.conf
- /bin/sed -i "s...@mm_x_kbd_device@%${MM_X_KBD_DEVICE}%"
/etc/X11/xorg.conf
- /bin/sed -i "s...@mouse_true@%${MOUSE_TRUE}%"
/etc/X11/xorg.conf
- /bin/sed -i "s...@mm_x_mouse_device@%${MM_X_MOUSE_DEVICE}%"
/etc/X11/xorg.conf
+ /bin/sed -i "s...@inputdevice_event@%${INPUTDEVICE_EVENT}%"
/etc/X11/xorg.conf
+ /bin/sed -i "s...@serverlayout_event@%${SERVERLAYOUT_EVENT}%"
/etc/X11/xorg.conf
/bin/sed -i "s...@mm_x_driver@%${MM_X_DRIVER}%"
/etc/X11/xorg.conf
/bin/sed -i "s...@mm_x_device_intel@%${MM_X_DEVICE_INTEL}%"
/etc/X11/xorg.conf
/bin/sed -i "s...@mm_x_device_nvidia@%${MM_X_DEVICE_NVIDIA}%"
/etc/X11/xorg.conf
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
Sat Dec 27 14:59:29 2008
@@ -18,153 +18,6 @@
#===============================================================================
#
#===============================================================================
-$var_list{'MM_X_KBD_DEVICE'} =
-{
- prerequisite => ['MM_LIRC_DEVICE_LIST'],
- value_default => 'auto',
- value_valid => 'auto|none|.+',
- value_auto => sub
- {
- my $minimyth = shift;
- my $name = shift;
-
- my $device_canonicalize = sub
- {
- my $device = shift;
-
- if (($device) && (-e $device) && (open(FILE, '-|',
qq(/sbin/udevadm info --query name --root --name='$device'))))
- {
- while (<FILE>)
- {
- chomp;
- $device = $_;
- last;
- }
- close(FILE);
- }
-
- return $device;
- };
-
- my @device_list;
-
- foreach my $item (@{$minimyth->detect_state_get('kbd')})
- {
- my $device = &{$device_canonicalize}($item->{'device'});
- if ($device)
- {
- push(@device_list, "$device");
- }
- }
- # Remove any dumplicates.
- {
- my $prev = '';
- @device_list = grep($_ ne $prev && (($prev) = $_),
sort(@device_list));
- }
-
- if ($minimyth->var_get('MM_LIRC_DEVICE_LIST'))
- {
- my @blacklist = ();
- foreach my $item (split(/ +/,
$minimyth->var_get('MM_LIRC_DEVICE_LIST')))
- {
- if ($item)
- {
- my @item = split(/,/, $item);
- my $device = &{$device_canonicalize}($item[0]);
- push(@blacklist, $device);
- }
- }
- my $blacklist_filter = join('|', @blacklist);
- @device_list = grep(! /^($blacklist_filter)$/, @device_list);
- }
-
- if (defined $device_list[0])
- {
- return $device_list[0];
- }
- else
- {
- return 'none';
- }
- },
- value_none => ''
-};
-
-$var_list{'MM_X_MOUSE_DEVICE'} =
-{
- prerequisite => ['MM_LIRC_DEVICE_LIST'],
- value_default => 'auto',
- value_valid => 'auto|none|.+',
- value_auto => sub
- {
- my $minimyth = shift;
- my $name = shift;
-
- my $device_canonicalize = sub
- {
- my $device = shift;
-
- if (($device) && (-e $device) && (open(FILE, '-|',
qq(/sbin/udevadm info --query name --root --name='$device'))))
- {
- while (<FILE>)
- {
- chomp;
- $device = $_;
- last;
- }
- close(FILE);
- }
-
- return $device;
- };
-
- my @device_list;
-
- foreach my $item (@{$minimyth->detect_state_get('mouse')})
- {
- my $device = &{$device_canonicalize}($item->{'device'});
- if ($device)
- {
- push(@device_list, "$device");
- }
- }
- # Remove any dumplicates.
- {
- my $prev = '';
- @device_list = grep($_ ne $prev && (($prev) = $_),
sort(@device_list));
- }
-
- if ($minimyth->var_get('MM_LIRC_DEVICE_LIST'))
- {
- my @blacklist = ();
- foreach my $item (split(/ +/,
$minimyth->var_get('MM_LIRC_DEVICE_LIST')))
- {
- if ($item)
- {
- my @item = split(/,/, $item);
- my $device = &{$device_canonicalize}($item[0]);
- push(@blacklist, $device);
- }
- }
- my $blacklist_filter = join('|', @blacklist);
- @device_list = grep(! /^($blacklist_filter)$/, @device_list);
- }
-
- if (defined $device_list[0])
- {
- return $device_list[0];
- }
- else
- {
- return 'none';
- }
- },
- value_none => ''
-};
-
-#===============================================================================
-#
-#===============================================================================
$var_list{'MM_X_DRIVER'} =
{
value_default => sub
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
Sat Dec 27 14:59:29 2008
@@ -104,6 +104,8 @@
MM_X_DISPLAYSIZE_X
MM_X_DISPLAYSIZE_Y
MM_X_DVI_ENABLED
+MM_X_KBD_DEVICE
+MM_X_MOUSE_DEVICE
MM_X_RESOLUTION_X
MM_X_RESOLUTION_Y
MM_X_SCREENSAVER_ENABLED
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
Sat Dec 27 14:59:29 2008
@@ -287,15 +287,89 @@
$mode_1 = '"' . $mode_1 . '"' if ($mode_1 ne '');
$mode_2 = '"' . $mode_2 . '"' if ($mode_2 ne '');
- my $kbd_true = $minimyth->var_get('MM_X_KBD_DEVICE') ? '' : '#';
- my $mouse_true = $minimyth->var_get('MM_X_MOUSE_DEVICE') ? '' : '#';
+ my $inputdevice_event = '';
+ my $serverlayout_event = '';
+ {
+ # Determine event device list.
+ # The list is all udev detected event devices that are not claimed
by LIRC.
+ my @device_list;
+ {
+ my $device_canonicalize = sub
+ {
+ my $device = shift;
+
+ if (($device) && (-e $device) && (open(FILE, '-|',
qq(/sbin/udevadm info --query name --root --name='$device'))))
+ {
+ while (<FILE>)
+ {
+ chomp;
+ $device = $_;
+ last;
+ }
+ close(FILE);
+ }
+
+ return $device;
+ };
+
+ # Get all udev detected event devices.
+ foreach my $item (@{$minimyth->detect_state_get('event')})
+ {
+ my $device = &{$device_canonicalize}($item->{'device'});
+ if ($device)
+ {
+ push(@device_list, "$device");
+ }
+ }
+
+ # Remove any duplicates.
+ {
+ my $prev = '';
+ @device_list = grep($_ ne $prev && (($prev) = $_),
sort(@device_list));
+ }
+
+ # Remove any devices claimed by LIRC.
+ if ($minimyth->var_get('MM_LIRC_DEVICE_LIST'))
+ {
+ my @blacklist = ();
+ foreach my $item (split(/ +/,
$minimyth->var_get('MM_LIRC_DEVICE_LIST')))
+ {
+ if ($item)
+ {
+ my @item = split(/,/, $item);
+ my $device = &{$device_canonicalize}($item[0]);
+ push(@blacklist, $device);
+ }
+ }
+ my $blacklist_filter = join('|', @blacklist);
+ @device_list = grep(! /^($blacklist_filter)$/,
@device_list);
+ }
+ }
+
+ my @inputdevice = ();
+ my @serverlayout = ();
+ foreach my $device (@device_list)
+ {
+ my $identifier = $device;
+ $identifier =~ s/.*\///;
+
+ push(@inputdevice, qq(Section "InputDevice"));
+ push(@inputdevice, qq( Identifier "$identifier"));
+ push(@inputdevice, qq( Driver "evdev"));
+ push(@inputdevice, qq( Option "Device" "$device"));
+ push(@inputdevice, qq(EndSection));
+ push(@inputdevice, qq());
+
+ push(@serverlayout,
qq(InputDevice "$identifier" "SendCoreEvents"));
+ }
+ $inputdevice_event = join("\n", @inputdevice);
+ $serverlayout_event = join("\n ", @serverlayout);
+ }
$minimyth->file_replace_variable(
'/etc/X11/xorg.conf',
- { '@KBD_TRUE@' =>
$kbd_true ,
- '@MM_X_KBD_DEVICE@' =>
$minimyth->var_get('MM_X_KBD_DEVICE') ,
- '@MOUSE_TRUE@' =>
$mouse_true ,
- '@MM_X_MOUSE_DEVICE@' =>
$minimyth->var_get('MM_X_MOUSE_DEVICE'),
+ { '@INPUTDEVICE_EVENT@' =>
$inputdevice_event ,
+ '@SERVERLAYOUT_EVENT@' =>
$serverlayout_event ,
'@MM_X_DRIVER@' =>
$minimyth->var_get('MM_X_DRIVER') ,
'@MM_X_DEVICE_INTEL@' =>
$device_intel ,
'@MM_X_DEVICE_NVIDIA@' =>
$device_nvidia ,
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-event.rules.disabled
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-event.rules.disabled
Sat Dec 27 14:59:29 2008
@@ -0,0 +1,25 @@
+#-------------------------------------------------------------------------------
+# Detect event devices.
+#-------------------------------------------------------------------------------
+ACTION!="add|change|remove", GOTO="end"
+KERNEL=="event[0-9]*", SUBSYSTEM=="input", GOTO="begin"
+GOTO="end"
+LABEL="begin"
+
+ENV{mm_detect_state_event}=""
+
+# Serial or PS2 keyboard device.
+DRIVERS=="atkbd",
ENV{mm_detect_state_event}="keyboard"
+# Serial or PS2 mouse device.
+DRIVERS=="psmouse",
ENV{mm_detect_state_event}="mouse"
+# USB keyboard device.
+SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03",
ATTRS{bInterfaceProtocol}=="01", ENV{mm_detect_state_event}="keyboard-usb"
+# USB mouse device.
+SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03",
ATTRS{bInterfaceProtocol}=="02", ENV{mm_detect_state_event}="mouse-usb"
+# Wiimote
+ATTRS{name}=="Nintendo
Wiimote",
ENV{mm_detect_state_event}="wiimote"
+
+# The state has been set, so save it.
+ENV{mm_detect_state_event}=="?*", RUN+="/lib/udev/mm_detect event %k
$env{mm_detect_state_event} state_prepend_devname"
+
+LABEL="end"
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Sat Dec 27
14:59:29 2008
@@ -1 +1 @@
-857287ee00429522e048ae993d201f5f download/MiniMyth.pm
+2fc0fdbacb9e51c51fa445087ca9c910 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Sat Dec
27 14:59:29 2008
@@ -405,10 +405,9 @@
my %map;
$map{'audio'} = [ 'card_number' , 'device_number' ];
$map{'backend'} = [ 'enabled'];
- $map{'kbd'} = [ 'device' ];
+ $map{'event'} = [ 'device' , 'type' ];
$map{'lcdproc'} = [ 'device' , 'driver'];
$map{'lirc'} = [ 'device' , 'driver', 'lircd_conf' ];
- $map{'mouse'} = [ 'device' ];
$map{'video'} = [ 'driver' ];
my @state;
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
