diff options
Diffstat (limited to 'abs/core-testing/LinHES-config/xconfig.sh')
| -rwxr-xr-x | abs/core-testing/LinHES-config/xconfig.sh | 93 |
1 files changed, 48 insertions, 45 deletions
diff --git a/abs/core-testing/LinHES-config/xconfig.sh b/abs/core-testing/LinHES-config/xconfig.sh index f980de2..39b5ae6 100755 --- a/abs/core-testing/LinHES-config/xconfig.sh +++ b/abs/core-testing/LinHES-config/xconfig.sh @@ -8,9 +8,9 @@ function Xvalues { echo $CMDLINE |grep -q forceXvesa if [ $? = 0 ] then - VGACARDTYPE=vesa + VGACARDTYPE=vesa else - VGACARDTYPE=`lspci|grep -i vga|sort -r|head -n 1| cut -d: -f3|cut -d" " -f 2` + VGACARDTYPE=`lspci|grep -i vga|sort -r|head -n 1| cut -d: -f3|cut -d" " -f 2` fi echo $VGACARDTYPE currentmode=`cat $BASE/etc/X11/xorg.conf |grep Modes|awk -Fs ' { print $2 } '` @@ -28,12 +28,12 @@ then else echo "Didn't find the file" echo "Copy your config file to $BASE/data/home/mythtv/templates/xorg.use " >> $XORG_CONF - fi + fi else setupAdvancedX fi else - setupX + setupX fi } @@ -65,27 +65,27 @@ echo "#doing the advanced" > /tmp/options ML="\t Modes ${Xres}" else - ML="\t Modes \"${Xres}\"" + ML="\t Modes \"${Xres}\"" fi echo $ML case $Xcardtype in NVIDIA|nVidia ) - case $Xconnection in + case $Xconnection in DVI) ConnectedMonitor=DFP ;; vga) ConnectedMonitor=CRT;; Auto) ConnectedMonitor=Auto;; TV) ConnectedMonitor=TV - echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options - echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options - ;; + echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options + echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options + ;; esac if [ $ConnectedMonitor = Auto ] then - echo "auto connection" + echo "auto connection" else - echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options - echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options + echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options + echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options echo "Option \"DigitalVibrance\" \"0\"" >> /tmp/options fi @@ -96,7 +96,7 @@ echo "#doing the advanced" > /tmp/options DS=" DisplaySize $XDisplaysize" HS=" HorizSync $XHsync" VR=" VertRefresh $XVrefresh" - else + else EDIDvalue=false EDIDFREQ=true DS="# Display size edid used " @@ -109,46 +109,46 @@ echo "#doing the advanced" > /tmp/options sed -e "s/^.*Modes.*$/${ML}/" \ - -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcatagory" \ - -e "s/^.*DisplaySize.*$/ $DS/" \ - -e "s/^#.*HorizSync.*$/ $HS/g" \ - -e "s/^#.*VertRefresh.*$/ $VR/g" \ - -e "/INSERT HERE/r /tmp/options" $TEMPLATES/xorg/xorg.conf.nvidia > $XORG_CONF - - ;; - ati|ATI) - case $Xconnection in + -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcatagory" \ + -e "s/^.*DisplaySize.*$/ $DS/" \ + -e "s/^#.*HorizSync.*$/ $HS/g" \ + -e "s/^#.*VertRefresh.*$/ $VR/g" \ + -e "/INSERT HERE/r /tmp/options" $TEMPLATES/xorg/xorg.conf.nvidia > $XORG_CONF + + ;; + ati|ATI) + case $Xconnection in DVI) ConnectedMonitor="tmds1,nocrt1,notv";; VGA) ConnectedMonitor="crt1,notmds1,notv" ;; TV) ConnectedMonitor="tv,nocrt1,notmds1" - echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options - echo "Option \"TVFormat\" \"$XTVconnection\"" >> /tmp/options - ;; + echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options + echo "Option \"TVFormat\" \"$XTVconnection\"" >> /tmp/options + ;; - esac + esac - if [ x$XignoreEDID = x1 ] + if [ x$XignoreEDID = x1 ] then DS=" DisplaySize $XDisplaysize" HS=" HorizSync $XHsync" VR=" VertRefresh $XVrefresh" - else + else DS="# Display size edid used " HS="#Hsync edid used " VR="#Vertrefresh edid used " fi - echo "Option \"ForceMonitors\" \"$ConnectedMonitor\"" >> /tmp/options + echo "Option \"ForceMonitors\" \"$ConnectedMonitor\"" >> /tmp/options - sed -e "s/^.*Modes.*$/\t $ML/" \ - -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcatagory" \ - -e "s/^.*DisplaySize.*$/ $DS/" \ - -e "s/^#.*HorizSync.*$/ $HS/g" \ - -e "s/^#.*VertRefresh.*$/ $VR/g" \ - -e "/INSERT HERE/r /tmp/options" $TEMPLATES/xorg/xorg.conf.ati > $XORG_CONF - ;; + sed -e "s/^.*Modes.*$/\t $ML/" \ + -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcatagory" \ + -e "s/^.*DisplaySize.*$/ $DS/" \ + -e "s/^#.*HorizSync.*$/ $HS/g" \ + -e "s/^#.*VertRefresh.*$/ $VR/g" \ + -e "/INSERT HERE/r /tmp/options" $TEMPLATES/xorg/xorg.conf.ati > $XORG_CONF + ;; via|VIA|Via) echo "no via here" ;; @@ -178,7 +178,7 @@ function setupX { fi ;; VMware ) - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.vmware > $XORG_CONF + sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.vmware > $XORG_CONF ;; VIA ) @@ -190,7 +190,7 @@ function setupX { fi ;; - Intel) + Intel) sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.intel > $XORG_CONF if [ ! x$TESTMODE = "xtest" ] then @@ -199,13 +199,16 @@ function setupX { fi ;; - vesa) sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.vesa > $XORG_CONF - - ;; - *) #XCONF=`hwd -x |grep etc` - XCONF=`hwd -x |grep etc|tr -d [:cntrl:]|cut -d\/ -f 2-` - cat /$XCONF |grep -v Modes | sed -e '/Depth 16/a Modes "800x600"' -e 's/dev\/mouse/dev\/psaux/g'> $XORG_CONF - ;; + vesa) sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.vesa > $XORG_CONF + ;; + *) #XCONF=`hwd -x |grep etc` + #XCONF=`hwd -x |grep etc|tr -d [:cntrl:]|cut -d\/ -f 2-` + XCONF=/root/xorg.conf.new + X -configure + echo $XORG_CONF + grep -v Modes $XCONF | sed -e '/Depth.*16/a Modes "800x600"' -e '/Depth.*24/a Modes "800x600"' -e 's/dev\/mouse/dev\/psaux/g'> $XORG_CONF + rm -f $XCONF + ;; esac fi |