Author: pebender
Date: Wed Apr 8 02:29:35 2009
New Revision: 4569
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
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/x.pm
Log:
- Added MM_X_OUTPUT_HDMI.
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 Wed Apr 8
02:29:35 2009
@@ -30,6 +30,7 @@
/minimyth.
- Added MiniMyth configuration variables MM_AUDIO_GAIN,
MM_AUDIO_FETCH_ASOUND_CONF and MM_AUDIO_FETCH_ASOUND_STATE.
+ - Added MiniMyth configuration variable MM_X_OUTPUT_HDMI.
Modified kernel
- Enabled IP multicast to so the kernel can drop IPTV multicast
traffic.
Modified: trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Wed Apr
8
02:29:35 2009
@@ -704,6 +704,7 @@
<li><a
href="#MM_X_SCREENSAVER_TIMEOUT">MM_X_SCREENSAVER_TIMEOUT</a></li>
<li><a
href="#MM_X_SCREENSAVER_HACK">MM_X_SCREENSAVER_HACK</a></li>
<li><a href="#MM_X_MYTH_PROGRAM">MM_X_MYTH_PROGRAM</a></li>
+ <li><a href="#MM_X_OUTPUT_HDMI">MM_X_OUTPUT_HDMI</a></li>
<li><a href="#MM_X_OUTPUT_DVI">MM_X_OUTPUT_DVI</a></li>
<li><a href="#MM_X_OUTPUT_VGA">MM_X_OUTPUT_VGA</a></li>
<li><a href="#MM_X_OUTPUT_TV">MM_X_OUTPUT_TV</a></li>
@@ -929,6 +930,24 @@
The X output configuration variables are:
</p>
<dl>
+ <dt
id="MM_X_OUTPUT_HDMI"><strong>MM_X_OUTPUT_HDMI</strong></dt>
+ <dd>
+ <p>
+ Set the HDMI output to use.
+ Valid values are 'none', 'auto' and HDMI output number,
with 'none' the default.
+ </p>
+ <p>
+ If the value is 'none', then a HDMI output will not be
enabled.
+ </p>
+ <p>
+ If the value is 'auto', then an HDMI output will be
enabled and the driver will decide which HDMI output to use.
+ Usually, the driver will pick the HDMI output that it
considers the first HDMI output.
+ </p>
+ <p>
+ If the value is a number, then HDMI output specified by
the number will be enabled.
+ HDMI outputs are numbered starting from '0'.
+ </p>
+ </dd>
<dt id="MM_X_OUTPUT_DVI"><strong>MM_X_OUTPUT_DVI</strong></dt>
<dd>
<p>
@@ -947,7 +966,6 @@
DVI-D outputs are numbered starting from '0'.
</p>
</dd>
-
<dt id="MM_X_OUTPUT_VGA"><strong>MM_X_OUTPUT_VGA</strong></dt>
<dd>
<p>
@@ -966,7 +984,6 @@
VGA outputs are numbered starting from '0'.
</p>
</dd>
-
<dt id="MM_X_OUTPUT_TV"><strong>MM_X_OUTPUT_TV</strong></dt>
<dd>
<p>
@@ -1133,6 +1150,7 @@
<p>
If the value is 'auto' then the screen mode will be
auto-configured based on
'<a
href="#MM_VIDEO_ASPECT_RATIO">MM_VIDEO_ASPECT_RATIO</a>',
+ '<a href="#MM_X_OUTPUT_HDMI">MM_X_OUTPUT_HDMI</a>',
'<a href="#MM_X_OUTPUT_DVI">MM_X_OUTPUT_DVI</a>',
'<a href="#MM_X_OUTPUT_VGA">MM_X_OUTPUT_VGA</a>',
'<a href="#MM_X_OUTPUT_TV">MM_X_OUTPUT_TV</a>',
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
Wed Apr 8 02:29:35 2009
@@ -109,6 +109,11 @@
#===============================================================================
#
#===============================================================================
+$var_list{'MM_X_OUTPUT_HDMI'} =
+{
+ value_default => 'none',
+ value_valid => 'none|auto|[0-9]+'
+};
$var_list{'MM_X_OUTPUT_DVI'} =
{
value_default => 'none',
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
Wed Apr 8 02:29:35 2009
@@ -106,6 +106,11 @@
when (/^auto$/) { $device_intel = 'TMDS'; }
when (/^([0-9]+)$/) { $device_intel = 'TMDS-' . $1; }
}
+ given ($minimyth->var_get('MM_X_OUTPUT_HDMI'))
+ {
+ when (/^auto$/) { $device_intel = 'HDMI'; }
+ when (/^([0-9]+)$/) { $device_intel = 'HDMI-' . $1; }
+ }
if ($device_intel eq '')
{
$minimyth->message_output('err', "no X video output
enabled.");
@@ -129,6 +134,11 @@
when (/^auto$/) { $device_nvidia = 'DFP'; }
when (/^([0-9]+)$/) { $device_nvidia = 'DFP-' . $1; }
}
+ given ($minimyth->var_get('MM_X_OUTPUT_HDMI'))
+ {
+ when (/^auto$/) { $device_nvidia = 'DFP'; }
+ when (/^([0-9]+)$/) { $device_nvidia = 'DFP-' . $1; }
+ }
if ($device_nvidia eq '')
{
$minimyth->message_output('err', "no X video output
enabled.");
@@ -148,6 +158,11 @@
when (/^([0-9]+)$/) { $device_via .= ',' if ($device_via
ne '') ; $device_via .= 'CRT'; }
}
given ($minimyth->var_get('MM_X_OUTPUT_DVI'))
+ {
+ when (/^auto$/) { $device_via .= ',' if ($device_via
ne '') ; $device_via .= 'LCD'; }
+ when (/^([0-9]+)$/) { $device_via .= ',' if ($device_via
ne '') ; $device_via .= 'LCD'; }
+ }
+ given ($minimyth->var_get('MM_X_OUTPUT_HDMI'))
{
when (/^auto$/) { $device_via .= ',' if ($device_via
ne '') ; $device_via .= 'LCD'; }
when (/^([0-9]+)$/) { $device_via .= ',' if ($device_via
ne '') ; $device_via .= 'LCD'; }
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
