Browse files

Move the keylayouts to their own dir for organization. Update to new …

…kernel and modules, include tun.ko. tweak the init.rc
  • Loading branch information...
1 parent d2ccf9b commit 64aa7d8f176f1a76f02c1dccb2cd301fbfa95fe7 @LinuxBozo LinuxBozo committed Jul 14, 2011
View
16 BoardConfig.mk
@@ -48,7 +48,7 @@ TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := ./device/samsung/infuse4g/releaseto
TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := ./device/samsung/infuse4g/releasetools/infuse4g_img_from_target_files
# Camera
-USE_CAMERA_STUB := true
+USE_CAMERA_STUB := false
ifeq ($(USE_CAMERA_STUB),false)
BOARD_CAMERA_LIBRARIES := libcamera
endif
@@ -63,9 +63,6 @@ BOARD_V4L2_DEVICE := /dev/video1
BOARD_CAMERA_DEVICE := /dev/video0
BOARD_SECOND_CAMERA_DEVICE := /dev/video2
-# FM Radio
-BOARD_HAVE_FM_RADIO := false
-
BOARD_NAND_PAGE_SIZE := 4096 -s 128
BOARD_KERNEL_BASE := 0x32000000
BOARD_KERNEL_PAGESIZE := 4096
@@ -82,10 +79,10 @@ WPA_SUPPLICANT_VERSION := VER_0_6_X
BOARD_WPA_SUPPLICANT_DRIVER := WEXT
BOARD_WLAN_DEVICE := dhd
WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/dhd.ko"
-WIFI_DRIVER_FW_STA_PATH := "/vendor/firmware/fw_bcm4329.bin"
-WIFI_DRIVER_FW_AP_PATH := "/vendor/firmware/fw_bcm4329_apsta.bin"
+WIFI_DRIVER_FW_STA_PATH := "/vendor/firmware/bcm4330_sta.bin"
+WIFI_DRIVER_FW_AP_PATH := "/vendor/firmware/bcm4330_aps.bin"
WIFI_DRIVER_MODULE_NAME := "dhd"
-WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt"
+WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/firmware/bcm4330_sta.bin nvram_path=/vendor/firmware/nvram_net.txt"
# Vold
BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
@@ -94,6 +91,9 @@ BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_HAS_NO_SELECT_BUTTON := true
BOARD_CUSTOM_BOOTIMG_MK := device/samsung/infuse4g/shbootimg.mk
-TARGET_RECOVERY_PRE_COMMAND="echo 1 > /cache/.startrecovery; sync;"
+TARGET_RECOVERY_PRE_COMMAND := "echo 1 > /cache/.startrecovery; sync;"
+
+# Include aries specific stuff
+-include device/samsung/aries-common/Android.mk
TARGET_OTA_ASSERT_DEVICE := infuse4g,SGH-I997
View
0 asound.conf 100644 → 100755
File mode changed.
View
2 board-info.txt
@@ -1,3 +1,3 @@
-require board=aries
+require board=dempsey
require version-bootloader=I997
require version-baseband=I997
View
64 cypress-touchkey.kcm
@@ -1,64 +0,0 @@
-[type=QWERTY]
-
-# keycode display number base caps fn caps_fn
-
-A 'A' '2' 'a' 'A' '#' 0x00
-B 'B' '2' 'b' 'B' '<' 0x00
-C 'C' '2' 'c' 'C' '9' 0x00E7
-D 'D' '3' 'd' 'D' '5' 0x00
-E 'E' '3' 'e' 'E' '2' 0x0301
-F 'F' '3' 'f' 'F' '6' 0x00A5
-G 'G' '4' 'g' 'G' '-' '_'
-H 'H' '4' 'h' 'H' '[' '{'
-I 'I' '4' 'i' 'I' '$' 0x0302
-J 'J' '5' 'j' 'J' ']' '}'
-K 'K' '5' 'k' 'K' '"' '~'
-L 'L' '5' 'l' 'L' ''' '`'
-M 'M' '6' 'm' 'M' '!' 0x00
-N 'N' '6' 'n' 'N' '>' 0x0303
-O 'O' '6' 'o' 'O' '(' 0x00
-P 'P' '7' 'p' 'P' ')' 0x00
-Q 'Q' '7' 'q' 'Q' '*' 0x0300
-R 'R' '7' 'r' 'R' '3' 0x20AC
-S 'S' '7' 's' 'S' '4' 0x00DF
-T 'T' '8' 't' 'T' '+' 0x00A3
-U 'U' '8' 'u' 'U' '&' 0x0308
-V 'V' '8' 'v' 'V' '=' '^'
-W 'W' '9' 'w' 'W' '1' 0x00
-X 'X' '9' 'x' 'X' '8' 0xEF00
-Y 'Y' '9' 'y' 'Y' '%' 0x00A1
-Z 'Z' '9' 'z' 'Z' '7' 0x00
-
-# on pc keyboards
-COMMA ',' ',' ',' ';' ';' '|'
-PERIOD '.' '.' '.' ':' ':' 0x2026
-AT '@' '0' '@' '0' '0' 0x2022
-SLASH '/' '/' '/' '?' '?' '\'
-
-SPACE 0x20 0x20 0x20 0x20 0xEF01 0xEF01
-ENTER 0xa 0xa 0xa 0xa 0xa 0xa
-
-TAB 0x9 0x9 0x9 0x9 0x9 0x9
-0 '0' '0' '0' ')' ')' ')'
-1 '1' '1' '1' '!' '!' '!'
-2 '2' '2' '2' '@' '@' '@'
-3 '3' '3' '3' '#' '#' '#'
-4 '4' '4' '4' '$' '$' '$'
-5 '5' '5' '5' '%' '%' '%'
-6 '6' '6' '6' '^' '^' '^'
-7 '7' '7' '7' '&' '&' '&'
-8 '8' '8' '8' '*' '*' '*'
-9 '9' '9' '9' '(' '(' '('
-
-GRAVE '`' '`' '`' '~' '`' '~'
-MINUS '-' '-' '-' '_' '-' '_'
-EQUALS '=' '=' '=' '+' '=' '+'
-LEFT_BRACKET '[' '[' '[' '{' '[' '{'
-RIGHT_BRACKET ']' ']' ']' '}' ']' '}'
-BACKSLASH '\' '\' '\' '|' '\' '|'
-SEMICOLON ';' ';' ';' ':' ';' ':'
-APOSTROPHE ''' ''' ''' '"' ''' '"'
-STAR '*' '*' '*' '*' '*' '*'
-POUND '#' '#' '#' '#' '#' '#'
-PLUS '+' '+' '+' '+' '+' '+'
-
View
4 cypress-touchkey.kl
@@ -1,4 +0,0 @@
-key 139 MENU VIRTUAL
-key 102 HOME VIRTUAL
-key 158 BACK VIRTUAL
-key 217 SEARCH VIRTUAL
View
28 infuse4g.mk
@@ -38,7 +38,7 @@
# These is the hardware-specific overlay, which points to the location
# of hardware-specific resource overrides, typically the frameworks and
# application settings that are stored in resourced.
-DEVICE_PACKAGE_OVERLAYS := device/samsung/infuse4g/overlay
+DEVICE_PACKAGE_OVERLAYS := device/samsung/aries-common/overlay
# These are the hardware-specific configuration files
PRODUCT_COPY_FILES := \
@@ -50,24 +50,27 @@ PRODUCT_COPY_FILES := \
PRODUCT_COPY_FILES += \
device/samsung/infuse4g/init.rc:root/init.rc \
device/samsung/infuse4g/init.dempsey.rc:root/init.dempsey.rc \
- device/samsung/infuse4g/ueventd.dempsey.rc:root/ueventd.dempsey.rc
+ device/samsung/infuse4g/ueventd.dempsey.rc:root/ueventd.dempsey.rc \
+ device/samsung/infuse4g/setupenv.sh:recovery/root/sbin/setupenv.sh
# Prebuilt kl keymaps
PRODUCT_COPY_FILES += \
- device/samsung/infuse4g/cypress-touchkey.kl:system/usr/keylayout/cypress-touchkey.kl \
- device/samsung/infuse4g/sec_jack.kl:system/usr/keylayout/sec_jack.kl \
- #device/samsung/infuse4g/aries-keypad.kl:system/usr/keylayout/aries-keypad.kl \
- device/samsung/infuse4g/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl
+ device/samsung/infuse4g/keylayout/sec_jack.kl:system/usr/keylayout/sec_jack.kl \
+ device/samsung/infuse4g/keylayout/melfas-touchkey.kl:system/usr/keylayout/melfas-touchkey.kl \
+ device/samsung/infuse4g/keylayout/qt602240_ts_input.kl:system/usr/keylayout/qt602240_ts_input.kl \
+ device/samsung/infuse4g/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \
+ device/samsung/infuse4g/keylayout/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl
# Generated kcm keymaps
PRODUCT_PACKAGES := \
- cypress-touchkey.kcm \
+ melfas-touchkey.kcm \
s3c-keypad.kcm
# Filesystem management tools
PRODUCT_PACKAGES += \
- make_ext4fs
+ make_ext4fs \
+ setup_fs
# These are the OpenMAX IL configuration files
PRODUCT_COPY_FILES += \
@@ -80,15 +83,15 @@ PRODUCT_PACKAGES += \
# apns config file
PRODUCT_COPY_FILES += \
- vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+ vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
# These are the hardware-specific features
PRODUCT_COPY_FILES += \
frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
frameworks/base/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
- frameworks/base/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
+ frameworks/base/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
@@ -144,7 +147,6 @@ PRODUCT_COPY_FILES += \
device/samsung/infuse4g/modules/param.ko:root/lib/modules/param.ko \
device/samsung/infuse4g/modules/rfs_fat.ko:root/lib/modules/rfs_fat.ko \
device/samsung/infuse4g/modules/rfs_glue.ko:root/lib/modules/rfs_glue.ko \
- device/samsung/infuse4g/modules/storage.ko:recovery/lib/modules/storage.ko
#recovery
@@ -155,7 +157,6 @@ PRODUCT_COPY_FILES += \
device/samsung/infuse4g/modules/param.ko:recovery/lib/modules/param.ko \
device/samsung/infuse4g/modules/rfs_fat.ko:recovery/root/lib/modules/rfs_fat.ko \
device/samsung/infuse4g/modules/rfs_glue.ko:recovery/root/lib/modules/rfs_glue.ko \
- device/samsung/infuse4g/modules/storage.ko:recovery/lib/modules/storage.ko
#system
PRODUCT_COPY_FILES += \
@@ -167,9 +168,12 @@ PRODUCT_COPY_FILES += \
device/samsung/infuse4g/modules/s3c_lcd.ko:system/lib/modules/s3c_lcd.ko \
device/samsung/infuse4g/modules/s3c_bc.ko:system/lib/modules/s3c_bc.ko \
device/samsung/infuse4g/modules/Si4709_driver.ko:system/lib/modules/Si4709_driver.ko \
+ device/samsung/infuse4g/modules/storage.ko:system/lib/modules/storage.ko \
+ device/samsung/infuse4g/modules/tun.ko:system/lib/modules/tun.ko \
device/samsung/infuse4g/modules/svnet.ko:system/lib/modules/svnet.ko \
device/samsung/infuse4g/modules/vibrator.ko:system/lib/modules/vibrator.ko
+
ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_KERNEL := device/samsung/infuse4g/kernel
else
View
1 init.dempsey.rc
@@ -18,6 +18,7 @@ on boot
insmod /system/lib/modules/svnet.ko
insmod /system/lib/modules/modemctl.ko
insmod /system/lib/modules/bthid.ko
+ insmod /system/lib/modules/tun.ko
mount debugfs /sys/kernel/debug /sys/kernel/debug
View
7 init.rc
@@ -5,7 +5,7 @@ on init
sysclktz 0
-loglevel 9
+loglevel 8
# setup the global environment
export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
@@ -27,6 +27,11 @@ loglevel 9
insmod /lib/modules/fsr_stl.ko
insmod /lib/modules/rfs_glue.ko
insmod /lib/modules/rfs_fat.ko
+
+# Param block
+ mkdir /mnt/.lfs 0755 root root
+ insmod /lib/modules/j4fs.ko
+ mount j4fs /dev/block/stl6 /mnt/.lfs
insmod /lib/modules/param.ko
# Backward compatibility
View
BIN kernel
Binary file not shown.
View
10 keylayout/AVRCP.kl
@@ -0,0 +1,10 @@
+key 200 MEDIA_PLAY_PAUSE WAKE
+key 201 MEDIA_PLAY_PAUSE WAKE
+key 166 MEDIA_STOP WAKE
+key 163 MEDIA_NEXT WAKE
+key 165 MEDIA_PREVIOUS WAKE
+key 168 MEDIA_REWIND WAKE
+key 208 MEDIA_FAST_FORWARD WAKE
+key 164 MEDIA_PLAY_PAUSE WAKE
+key 128 MEDIA_STOP WAKE
+key 159 MEDIA_FAST_FORWARD WAKE
View
4 keylayout/melfas-touchkey.kl
@@ -0,0 +1,4 @@
+key 158 MENU WAKE_DROPPED
+key 139 HOME WAKE_DROPPED
+key 28 BACK WAKE_DROPPED
+key 107 SEARCH WAKE_DROPPED
View
4 keylayout/qt602240_ts_input.kl
@@ -0,0 +1,4 @@
+key 158 MENU WAKE_DROPPED
+key 139 HOME WAKE_DROPPED
+key 28 BACK WAKE_DROPPED
+key 107 SEARCH WAKE_DROPPED
View
4 qwerty.kl → keylayout/qwerty.kl
@@ -30,8 +30,8 @@ key 103 DPAD_UP WAKE_DROPPED
key 102 HOME WAKE
key 105 DPAD_LEFT WAKE_DROPPED
key 106 DPAD_RIGHT WAKE_DROPPED
-key 115 VOLUME_UP WAKE
-key 114 VOLUME_DOWN WAKE
+key 115 VOLUME_UP
+key 114 VOLUME_DOWN
key 116 POWER WAKE
key 212 CAMERA
View
8 s3c-keypad.kl → keylayout/s3c-keypad.kl
@@ -1,11 +1,11 @@
-key 42 VOLUME_UP WAKE
-key 58 VOLUME_DOWN WAKE
+key 42 VOLUME_UP WAKE
+key 58 VOLUME_DOWN WAKE
key 50 HOME WAKE_DROPPED
-key 26 ENDCALL WAKE_DROPPED
+key 26 POWER WAKE_DROPPED
key 34 BACK WAKE_DROPPED
key 57 DPAD_LEFT WAKE_DROPPED
key 49 DPAD_RIGHT WAKE_DROPPED
key 25 DPAD_UP WAKE_DROPPED
key 41 DPAD_DOWN WAKE_DROPPED
key 33 DPAD_CENTER WAKE_DROPPED
-key 10 POWER WAKE
+key 10 UNKNOWN WAKE_DROPPED
View
2 keylayout/sec_jack.kl
@@ -0,0 +1,2 @@
+key 248 HEADSETHOOK
+
View
BIN modules/Si4709_driver.ko
Binary file not shown.
View
BIN modules/bthid.ko
Binary file not shown.
View
BIN modules/dhd.ko
Binary file not shown.
View
BIN modules/modemctl.ko
Binary file not shown.
View
BIN modules/onedram.ko
Binary file not shown.
View
BIN modules/scsi_wait_scan.ko
Binary file not shown.
View
BIN modules/svnet.ko
Binary file not shown.
View
BIN modules/tun.ko
Binary file not shown.
View
BIN modules/vibrator.ko
Binary file not shown.
View
BIN modules/xt_TCPMSS.ko
Binary file not shown.
View
3 sec_jack.kl
@@ -1,3 +0,0 @@
-key 163 MEDIA_NEXT WAKE
-key 165 MEDIA_PREVIOUS WAKE
-key 226 HEADSETHOOK WAKE
View
10 setup-makefiles.sh
@@ -15,6 +15,7 @@
# limitations under the License.
DEVICE=infuse4g
+COMMON=aries-common
MANUFACTURER=samsung
mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE
@@ -47,9 +48,10 @@ PRODUCT_COPY_FILES := \\
packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml
# Pick up overlay for features that depend on non-open-source files
-DEVICE_PACKAGE_OVERLAYS := vendor/__MANUFACTURER__/__DEVICE__/overlay
+DEVICE_PACKAGE_OVERLAYS := vendor/__MANUFACTURER__/aries-common/overlay
\$(call inherit-product, vendor/__MANUFACTURER__/__DEVICE__/__DEVICE__-vendor-blobs.mk)
+\$(call inherit-product, vendor/__MANUFACTURER__/__COMMON__/aries-vendor-blobs.mk)
EOF
@@ -70,7 +72,7 @@ EOF
BOARD_GPS_LIBRARIES := libgps
-USE_CAMERA_STUB := true
+USE_CAMERA_STUB := false
BOARD_USES_GENERIC_AUDIO := false
@@ -82,8 +84,8 @@ BOARD_NO_32BPP := false
EOF
-mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/overlay/packages/apps/Launcher2/res/layout
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/overlay/packages/apps/Launcher2/res/layout/all_apps.xml
+mkdir -p ../../../vendor/$MANUFACTURER/$COMMON/overlay/packages/apps/Launcher2/res/layout
+(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$COMMON/overlay/packages/apps/Launcher2/res/layout/all_apps.xml
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
View
5 setupenv.sh
@@ -0,0 +1,5 @@
+#!/system/bin/sh
+
+rm -rf /sbin/sh
+
+exit
View
1 ueventd.dempsey.rc
@@ -16,6 +16,7 @@
# for Sensor HAL
/dev/yamaha_compass 0660 system system
+/dev/akm8973 0660 system system
/dev/accelerometer 0660 system system
# for GPS
View
6 updater.sh
@@ -11,7 +11,7 @@ test_mount()
if ! /tmp/busybox mount -t ext4 /dev/block/$2 /$1; then
umount_format $1 $2
else
- echo "Partition is already EXT4."
+ echo "Partition $1 is already EXT4."
fi
}
@@ -25,7 +25,7 @@ umount_format()
echo "Successfully converted $1 on $2"
else
echo "Cannot unmount $1 on $2"
- exit $;
+ exit $?
fi
}
@@ -36,4 +36,4 @@ test_mount cache stl11
test_mount dbdata stl10
test_mount data mmcblk0p2
-exit 0;
+exit 0
View
2 vold.fstab
@@ -16,4 +16,4 @@
dev_mount sdcard /mnt/sdcard 1 /devices/platform/s3c-sdhci.0/mmc_host/mmc0
# external sdcard
-dev_mount emmc /mnt/emmc auto /devices/platform/s3c-sdhci.2/mmc_host/mmc2
+dev_mount emmc /mnt/emmc auto /devices/platform/s3c-sdhci.2/mmc_host/mmc1

0 comments on commit 64aa7d8

Please sign in to comment.