diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2021-02-27 22:07:37 +0000 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-02-27 23:53:28 +0000 |
commit | aacb0811d98beb70a59d26edbfd43ba9c456497f (patch) | |
tree | 0c8a59421a28536887fc1b277884a4e220ffac4c /firmware/export | |
parent | 55dc86f5db1dbf26b4179aea5c7ccd315ee20266 (diff) | |
download | rockbox-aacb0811d98beb70a59d26edbfd43ba9c456497f.tar.gz rockbox-aacb0811d98beb70a59d26edbfd43ba9c456497f.zip |
Rename symbols of FiiO M3K Linux-based port
Mainly a straight replacement of FIIO_M3K -> FIIO_M3K_LINUX.
Change-Id: Id07c84f8150991d1b6851540c2c3f8f67e3f12c2
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config.h | 6 | ||||
-rw-r--r-- | firmware/export/config/fiiom3klinux.h (renamed from firmware/export/config/fiiom3k.h) | 4 | ||||
-rw-r--r-- | firmware/export/rbpaths.h | 4 | ||||
-rw-r--r-- | firmware/export/system.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 547c359d8d..e35d407372 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -163,7 +163,7 @@ | |||
163 | #define IHIFI_800_PAD 68 | 163 | #define IHIFI_800_PAD 68 |
164 | #define XDUOO_X3II_PAD 69 | 164 | #define XDUOO_X3II_PAD 69 |
165 | #define XDUOO_X20_PAD 70 | 165 | #define XDUOO_X20_PAD 70 |
166 | #define FIIO_M3K_PAD 71 | 166 | #define FIIO_M3K_LINUX_PAD 71 |
167 | #define EROSQ_PAD 72 | 167 | #define EROSQ_PAD 72 |
168 | 168 | ||
169 | /* CONFIG_REMOTE_KEYPAD */ | 169 | /* CONFIG_REMOTE_KEYPAD */ |
@@ -603,8 +603,8 @@ Lyre prototype 1 */ | |||
603 | #include "config/xduoox3ii.h" | 603 | #include "config/xduoox3ii.h" |
604 | #elif defined(XDUOO_X20) | 604 | #elif defined(XDUOO_X20) |
605 | #include "config/xduoox20.h" | 605 | #include "config/xduoox20.h" |
606 | #elif defined(FIIO_M3K) | 606 | #elif defined(FIIO_M3K_LINUX) |
607 | #include "config/fiiom3k.h" | 607 | #include "config/fiiom3klinux.h" |
608 | #elif defined(EROS_Q) | 608 | #elif defined(EROS_Q) |
609 | #include "config/aigoerosq.h" | 609 | #include "config/aigoerosq.h" |
610 | #else | 610 | #else |
diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3klinux.h index 6e831f2f55..51d2a222e6 100644 --- a/firmware/export/config/fiiom3k.h +++ b/firmware/export/config/fiiom3klinux.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * This config file is for the FiiO M3K | 2 | * This config file is for the FiiO M3K (Linux version) |
3 | */ | 3 | */ |
4 | 4 | ||
5 | /* For Rolo and boot loader */ | 5 | /* For Rolo and boot loader */ |
@@ -74,7 +74,7 @@ | |||
74 | #define HAVE_HEADPHONE_DETECTION | 74 | #define HAVE_HEADPHONE_DETECTION |
75 | 75 | ||
76 | /* KeyPad configuration for plugins */ | 76 | /* KeyPad configuration for plugins */ |
77 | #define CONFIG_KEYPAD FIIO_M3K_PAD | 77 | #define CONFIG_KEYPAD FIIO_M3K_LINUX_PAD |
78 | 78 | ||
79 | /* Define this if a programmable hotkey is mapped */ | 79 | /* Define this if a programmable hotkey is mapped */ |
80 | #define HAVE_HOTKEY | 80 | #define HAVE_HOTKEY |
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h index da5a2fb71c..f53d0eb480 100644 --- a/firmware/export/rbpaths.h +++ b/firmware/export/rbpaths.h | |||
@@ -43,7 +43,7 @@ | |||
43 | /* NOTE: target-specific hosted HOME_DIR resides in filesystem-app.c */ | 43 | /* NOTE: target-specific hosted HOME_DIR resides in filesystem-app.c */ |
44 | #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ | 44 | #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ |
45 | defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || \ | 45 | defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || \ |
46 | defined(HIBY_LINUX) || defined(FIIO_M3K) | 46 | defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) |
47 | 47 | ||
48 | #define HOME_DIR "/" | 48 | #define HOME_DIR "/" |
49 | 49 | ||
@@ -80,7 +80,7 @@ | |||
80 | 80 | ||
81 | #if defined(APPLICATION) && \ | 81 | #if defined(APPLICATION) && \ |
82 | !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ | 82 | !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ |
83 | defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)) | 83 | defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) |
84 | 84 | ||
85 | #define PLUGIN_DATA_DIR ROCKBOX_DIR "/rocks.data" | 85 | #define PLUGIN_DATA_DIR ROCKBOX_DIR "/rocks.data" |
86 | #define PLUGIN_GAMES_DATA_DIR PLUGIN_DATA_DIR | 86 | #define PLUGIN_GAMES_DATA_DIR PLUGIN_DATA_DIR |
diff --git a/firmware/export/system.h b/firmware/export/system.h index 68d7958870..f9a074349b 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h | |||
@@ -347,7 +347,7 @@ static inline void cpu_boost_unlock(void) | |||
347 | #ifndef SIMULATOR | 347 | #ifndef SIMULATOR |
348 | bool dbg_ports(void); | 348 | bool dbg_ports(void); |
349 | #endif | 349 | #endif |
350 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K) | 350 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) |
351 | bool dbg_hw_info(void); | 351 | bool dbg_hw_info(void); |
352 | #endif | 352 | #endif |
353 | 353 | ||