diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 4 | ||||
-rw-r--r-- | firmware/export/config/sonynwzlinux.h | 12 | ||||
-rw-r--r-- | firmware/export/hostfs.h | 3 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/sim-ui-defines.h | 7 |
4 files changed, 21 insertions, 5 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 8ec17f7ec6..c29b5318d5 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -95,12 +95,11 @@ target/hosted/samsungypr/radio-ypr.c | |||
95 | #endif | 95 | #endif |
96 | #endif | 96 | #endif |
97 | 97 | ||
98 | #ifdef SONY_NWZ_LINUX | 98 | #if defined(SONY_NWZ_LINUX) && !defined(SIMULATOR) |
99 | target/hosted/backtrace-glibc.c | 99 | target/hosted/backtrace-glibc.c |
100 | target/hosted/kernel-unix.c | 100 | target/hosted/kernel-unix.c |
101 | target/hosted/filesystem-unix.c | 101 | target/hosted/filesystem-unix.c |
102 | target/hosted/lc-unix.c | 102 | target/hosted/lc-unix.c |
103 | target/hosted/pcm-alsa.c | ||
104 | target/hosted/sonynwz/lcd-nwz.c | 103 | target/hosted/sonynwz/lcd-nwz.c |
105 | target/hosted/sonynwz/button-nwz.c | 104 | target/hosted/sonynwz/button-nwz.c |
106 | target/hosted/sonynwz/system-nwz.c | 105 | target/hosted/sonynwz/system-nwz.c |
@@ -467,6 +466,7 @@ target/hosted/pcm-alsa.c | |||
467 | #elif defined(HAVE_NWZ_LINUX_CODEC) | 466 | #elif defined(HAVE_NWZ_LINUX_CODEC) |
468 | drivers/audio/nwzlinux-codec.c | 467 | drivers/audio/nwzlinux-codec.c |
469 | target/hosted/alsa-controls.c | 468 | target/hosted/alsa-controls.c |
469 | target/hosted/pcm-alsa.c | ||
470 | #elif defined(HAVE_SDL_AUDIO) | 470 | #elif defined(HAVE_SDL_AUDIO) |
471 | drivers/audio/sdl.c | 471 | drivers/audio/sdl.c |
472 | #if CONFIG_CODEC == SWCODEC | 472 | #if CONFIG_CODEC == SWCODEC |
diff --git a/firmware/export/config/sonynwzlinux.h b/firmware/export/config/sonynwzlinux.h index 4c66651e6b..4d95ef9cdd 100644 --- a/firmware/export/config/sonynwzlinux.h +++ b/firmware/export/config/sonynwzlinux.h | |||
@@ -2,7 +2,9 @@ | |||
2 | * This config file is for the Sony NWZ Linux based targets | 2 | * This config file is for the Sony NWZ Linux based targets |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #ifndef SIMULATOR | ||
5 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) | 6 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) |
7 | #endif | ||
6 | 8 | ||
7 | /* define this if you have a bitmap LCD display */ | 9 | /* define this if you have a bitmap LCD display */ |
8 | #define HAVE_LCD_BITMAP | 10 | #define HAVE_LCD_BITMAP |
@@ -64,10 +66,17 @@ | |||
64 | #define CONFIG_KEYPAD SONY_NWZ_PAD | 66 | #define CONFIG_KEYPAD SONY_NWZ_PAD |
65 | #define HAS_BUTTON_HOLD | 67 | #define HAS_BUTTON_HOLD |
66 | 68 | ||
69 | /** Non-simulator section **/ | ||
70 | #ifndef SIMULATOR | ||
67 | /* We have usb power and can detect usb but it is handled by Linux */ | 71 | /* We have usb power and can detect usb but it is handled by Linux */ |
68 | #define HAVE_USB_POWER | 72 | #define HAVE_USB_POWER |
69 | #define USB_NONE | 73 | #define USB_NONE |
70 | 74 | ||
75 | /* Audio codec */ | ||
76 | #define HAVE_NWZ_LINUX_CODEC | ||
77 | |||
78 | #endif /* SIMULATOR */ | ||
79 | |||
71 | #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE | 80 | #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE |
72 | 81 | ||
73 | /* Linux controlls charging, we can monitor */ | 82 | /* Linux controlls charging, we can monitor */ |
@@ -92,9 +101,6 @@ | |||
92 | /* Battery */ | 101 | /* Battery */ |
93 | #define BATTERY_TYPES_COUNT 1 | 102 | #define BATTERY_TYPES_COUNT 1 |
94 | 103 | ||
95 | /* Audio codec */ | ||
96 | #define HAVE_NWZ_LINUX_CODEC | ||
97 | |||
98 | /* special define to be use in various places */ | 104 | /* special define to be use in various places */ |
99 | #define SONY_NWZ_LINUX | 105 | #define SONY_NWZ_LINUX |
100 | 106 | ||
diff --git a/firmware/export/hostfs.h b/firmware/export/hostfs.h index a24d009ca9..fa916870f3 100644 --- a/firmware/export/hostfs.h +++ b/firmware/export/hostfs.h | |||
@@ -60,6 +60,9 @@ extern int hostfs_driver_type(int drive); | |||
60 | # define hostfs_driver_type(drive) (STORAGE_NAND_NUM) | 60 | # define hostfs_driver_type(drive) (STORAGE_NAND_NUM) |
61 | # elif (CONFIG_STORAGE & STORAGE_RAMDISK) | 61 | # elif (CONFIG_STORAGE & STORAGE_RAMDISK) |
62 | # define hostfs_driver_type(drive) (STORAGE_RAMDISK_NUM) | 62 | # define hostfs_driver_type(drive) (STORAGE_RAMDISK_NUM) |
63 | /* we may have hostfs without application when building sims for applications! */ | ||
64 | # elif (CONFIG_STORAGE & STORAGE_HOSTFS) | ||
65 | # define hostfs_driver_type(drive) (STORAGE_HOSTFS_NUM) | ||
63 | # else | 66 | # else |
64 | # error Unknown storage driver | 67 | # error Unknown storage driver |
65 | # endif /* CONFIG_STORAGE */ | 68 | # endif /* CONFIG_STORAGE */ |
diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h index 8f2a112cf9..d14f70bf99 100644 --- a/firmware/target/hosted/sdl/sim-ui-defines.h +++ b/firmware/target/hosted/sdl/sim-ui-defines.h | |||
@@ -508,6 +508,13 @@ | |||
508 | #define UI_LCD_POSX 46 | 508 | #define UI_LCD_POSX 46 |
509 | #define UI_LCD_POSY 40 | 509 | #define UI_LCD_POSY 40 |
510 | 510 | ||
511 | #elif defined(SONY_NWZA860) | ||
512 | #define UI_TITLE "Sony NWZ-A860 Series" | ||
513 | #define UI_WIDTH 390 /* width of GUI window */ | ||
514 | #define UI_HEIGHT 690/* height of GUI window */ | ||
515 | #define UI_LCD_POSX 78 | ||
516 | #define UI_LCD_POSY 92 | ||
517 | |||
511 | #elif defined(SIMULATOR) | 518 | #elif defined(SIMULATOR) |
512 | #error no UI defines | 519 | #error no UI defines |
513 | #endif | 520 | #endif |