X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=init.sh;h=7ed51de1f2a3bef5036067f01ba7c7db6b5b8d0e;hp=219a4773726d8a12b1fcea890fcf35dee6527cae;hb=9425a96fd759ce75940288cf9084c48e7a721fff;hpb=4b2f7dac4c670f7a07866c360b33d2a826c8f148

diff --git a/init.sh b/init.sh
index 219a477..7ed51de 100644
--- a/init.sh
+++ b/init.sh
@@ -42,11 +42,8 @@ function init_hal_bluetooth()
 	done
 
 	case "$PRODUCT" in
-		T10*TA)
-			modprobe ak8975
-			modprobe hci-uart
+		T10*TA|HP*Omni*)
 			BTUART_PORT=/dev/ttyS1
-			brcm_patchram_plus -d --no2bytes --enable_hci --patchram /system/lib/firmware/brcm/bcm43241b4.hcd $BTUART_PORT
 			;;
 		MacBookPro8*)
 			rmmod b43
@@ -64,6 +61,7 @@ function init_hal_bluetooth()
 	if [ -n "$BTUART_PORT" ]; then
 		set_property hal.bluetooth.uart $BTUART_PORT
 		chown bluetooth.bluetooth $BTUART_PORT
+		btattach -P bcm -B $BTUART_PORT &
 		log -t hciconfig -p i "`hciconfig`"
 	fi
 }
@@ -111,24 +109,28 @@ function init_uvesafb()
 			;;
 	esac
 
-	modprobe uvesafb mode_option=${UVESA_MODE:-800x600}-16 ${UVESA_OPTION:-mtrr=3 scroll=redraw}
+	[ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
+	modprobe uvesafb mode_option=${UVESA_MODE:-800x600}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
 }
 
 function init_hal_gralloc()
 {
 	case "$(cat /proc/fb | head -1)" in
+		*virtiodrmfb)
+			set_property ro.hardware.hwcomposer drm
+			;&
 		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
 			set_property ro.hardware.gralloc drm
 			set_drm_mode
-			[ -n "$DEBUG" ] && set_property debug.egl.trace error
 			;;
 		"")
 			init_uvesafb
 			;&
 		0*)
-			[ "$HWACCEL" = "1" ] || set_property debug.egl.hw 0
 			;;
 	esac
+
+	[ -n "$DEBUG" ] && set_property debug.egl.trace error
 }
 
 function init_hal_hwcomposer()
@@ -243,6 +245,9 @@ function create_pointercal()
 function init_tscal()
 {
 	case "$PRODUCT" in
+		ST70416-6*)
+			modprobe gslx680_ts_acpi
+			;&
 		T91|T101|ET2002|74499FU|945GSE-ITE8712|CF-19[CDYFGKLP]*)
 			create_pointercal
 			return
@@ -271,8 +276,6 @@ function init_ril()
 			set_property rild.libargs "-d /dev/ttyUSB2 -v /dev/ttyUSB1"
 			;;
 		*)
-			set_property rild.libpath /system/lib/libreference-ril.so
-			set_property rild.libargs "-d /dev/ttyUSB2"
 			;;
 	esac
 }
@@ -399,18 +402,20 @@ PRODUCT=$(cat $DMIPATH/product_name)
 # import cmdline variables
 for c in `cat /proc/cmdline`; do
 	case $c in
-		androidboot.hardware=*)
+		*.*=*)
 			;;
 		*=*)
 			eval $c
-			case $c in
-				HWACCEL=*)
-					set_property debug.egl.hw $HWACCEL
-					;;
-				DEBUG=*)
-					set_property debug.logcat 1
-					;;
-			esac
+			if [ -z "$1" ]; then
+				case $c in
+					HWACCEL=*)
+						set_property debug.egl.hw $HWACCEL
+						;;
+					DEBUG=*)
+						[ -n "$DEBUG" ] && set_property debug.logcat 1
+						;;
+				esac
+			fi
 			;;
 	esac
 done