merging upstream

CyanogenMod · Jan 13, 2011 · c4b61e5 · c4b61e5
2 parents 9b138eb + ccbce5c
commit c4b61e5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 16 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -35,7 +35,6 @@ TARGET_NO_RADIOIMAGE := true
 # HW Graphics
 OMAP3_GL := true
 
-
 # Wifi
 USES_TI_WL1271 := true
 BOARD_WPA_SUPPLICANT_DRIVER := CUSTOM
@@ -78,5 +77,4 @@ ifdef OMAP_ENHANCEMENT
 COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT
 endif
 
-
 BOARD_USES_MKIMAGE := true
diff --git a/device_nookcolor.mk b/device_nookcolor.mk
@@ -24,7 +24,7 @@ DEVICE_PACKAGE_OVERLAYS += device/bn/nookcolor/overlay
 #$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
 # include cicada's sensors library
-common_ti_dirs := sensors
+common_ti_dirs := libsensors
 
 include $(call all-named-subdir-makefiles, $(common_ti_dirs))
 
@@ -125,7 +125,7 @@ PRODUCT_COPY_FILES += \
 # cicadaman's custom accel lib
 
 #PRODUCT_COPY_FILES += \
-#    device/bn/nookcolor/sensors.omap3.so:/system/lib/hw/
+#    device/bn/nookcolor/libsensors/sensors.nookcolor.so:/system/lib/hw/
 
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 LOCAL_KERNEL := device/bn/nookcolor/prebuilt/boot/uImage

diff --git a/sensors/Android.mk → libsensors/Android.mk b/sensors/Android.mk → libsensors/Android.mk
@@ -14,19 +14,27 @@
 
 
 LOCAL_PATH:= $(call my-dir)
+
+ifneq ($(TARGET_SIMULATOR),true)
+
 # HAL module implemenation, not prelinked and stored in
 # hw/<COPYPIX_HARDWARE_MODULE_ID>.<ro.board.platform>.so
 include $(CLEAR_VARS)
 
+LOCAL_MODULE := sensors.nookcolor
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+
+LOCAL_MODULE_TAGS := optional
+
 LOCAL_SRC_FILES := sensors.c
 
 LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_SHARED_LIBRARIES := libcutils
 
-LOCAL_MODULE := sensors.nookcolor
-LOCAL_MODULE_TAGS := optional
-
 include $(BUILD_SHARED_LIBRARY)
+
+endif # !TARGET_SIMULATOR
+
diff --git a/sensors/sensors.c → libsensors/sensors.c b/sensors/sensors.c → libsensors/sensors.c
@@ -101,7 +101,7 @@ static const struct sensor_t sSensorList[] = {
         { "KXTF9 3 axis accelerometer",
                 "kxtf9_accel",
                 1, SENSORS_HANDLE_BASE+ID_A,
-                SENSOR_TYPE_ACCELEROMETER, 4.0f*9.81f, 9.81f/1000.0f, 0.25f,  200, { } },
+                SENSOR_TYPE_ACCELEROMETER, 4.0f*9.81f, 9.81f/1000.0f, 0.25f, { } },
 /*	// KXTF9 TILT
 	{ "KXTF9 Orientation sensor",
 		"kxtf9_orientation",

diff --git a/postrecoveryboot.sh b/postrecoveryboot.sh
@@ -2,6 +2,7 @@
 
 mount /dev/block/mmcblk0p7 /cache
 
+# Resets the boot counter and the bcb instructions
 mkdir /rom
 mount /dev/block/mmcblk0p2 /rom
 echo -n -e "\x00\x00\x00\x00" > /rom/devconf/BootCnt 

diff --git a/recovery.fstab b/recovery.fstab
@@ -1,9 +1,8 @@
 # mount point   fstype      device
-/boot       	vfat        /dev/block/mmcblk0p1
-/rom        	vfat        /dev/block/mmcblk0p2
-/factory    	ext2        /dev/block/mmcblk0p3
-/system     	ext2        /dev/block/mmcblk0p5
-/data       	ext3        /dev/block/mmcblk0p6
-/cache      	ext3        /dev/block/mmcblk0p7
-/sdcard     	vfat        /dev/block/mmcblk1p1
+
+/sdcard		vfat		/dev/block/mmcblk1p1
+/system		ext2		/dev/block/mmcblk0p5
+/cache		ext3		/dev/block/mmcblk0p7
+/data		ext3		/dev/block/mmcblk0p6
+/boot       vfat        /dev/block/mmcblk0p1