Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
Creative Zen Vision: fix config file (?!)
If I'm interpreting the git history correctly,
the config file for Zen Vision was at some point
inadvertently replaced with one for the
Zen Vision:M.
This deletes the currently unused creativezv.h,
and moves its contents into zenvision.h.
The config files appear to be identical except for
CREATIVE_ZV vs CREATIVE_ZVM define, different
keypads (CREATIVEZVM_PAD vs CREATIVEZV_PAD) and
BOOTFILE_EXT (zv vs zvm), a different model name
and number, as well as different LCD dimensions
and DPI.
The buttonmap still seems to require adjustment.
Change-Id: I9a5e65df750db21be5f5a1ed7a80a50706237781
authored by
Christian Soffke
and committed by
Solomon Peachy
18aa0f62
f1173e07
+168
-167
-165
firmware/export/config/creativezv.h
-165
firmware/export/config/creativezv.h
···
1
-
/***************************************************************************
2
-
* __________ __ ___.
3
-
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4
-
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5
-
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6
-
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7
-
* \/ \/ \/ \/ \/
8
-
* $Id$
9
-
*
10
-
* Copyright (C) 2008 by Maurus Cuelenaere
11
-
*
12
-
* This program is free software; you can redistribute it and/or
13
-
* modify it under the terms of the GNU General Public License
14
-
* as published by the Free Software Foundation; either version 2
15
-
* of the License, or (at your option) any later version.
16
-
*
17
-
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18
-
* KIND, either express or implied.
19
-
*
20
-
****************************************************************************/
21
-
22
-
/*
23
-
* This config file is for the Creative Zen Vision
24
-
*/
25
-
26
-
#define CONFIG_SDRAM_START 0x00900000
27
-
28
-
#define CREATIVE_ZV 1
29
-
30
-
#define MODEL_NAME "Creative Zen Vision"
31
-
32
-
/* This makes it part of the Creative Zen Vision family :) */
33
-
#define CREATIVE_ZVx 1
34
-
35
-
/* For Rolo and boot loader */
36
-
#define MODEL_NUMBER 28
37
-
38
-
/* define this if you use an ATA controller */
39
-
#define CONFIG_STORAGE STORAGE_ATA
40
-
41
-
/*define this if the ATA controller and method of USB access support LBA48 */
42
-
#define HAVE_LBA48
43
-
44
-
45
-
46
-
47
-
/* define this if you have a colour LCD */
48
-
#define HAVE_LCD_COLOR
49
-
50
-
/* define this if you have access to the quickscreen */
51
-
#define HAVE_QUICKSCREEN
52
-
53
-
/* define this if you would like tagcache to build on this target */
54
-
#define HAVE_TAGCACHE
55
-
56
-
/* define this if the target has volume keys which can be used in the lists */
57
-
//#define HAVE_VOLUME_IN_LIST
58
-
59
-
/* LCD dimensions */
60
-
#define CONFIG_LCD LCD_CREATIVEZVM
61
-
62
-
/* choose the lcd orientation. both work */
63
-
#define CONFIG_ORIENTATION SCREEN_PORTRAIT
64
-
65
-
#define LCD_WIDTH 640
66
-
#define LCD_HEIGHT 480
67
-
/* sqrt(640^2 + 480^2) / 2.5 = 320.0 */
68
-
#define LCD_DPI 320
69
-
70
-
#define LCD_DEPTH 16 /* 65k colours */
71
-
#define LCD_PIXELFORMAT RGB565 /* rgb565 */
72
-
73
-
/* Define this if your LCD can be enabled/disabled */
74
-
#define HAVE_LCD_ENABLE
75
-
76
-
#define CONFIG_KEYPAD CREATIVEZV_PAD
77
-
#define HAVE_HEADPHONE_DETECTION
78
-
//#define HAVE_TOUCHPAD
79
-
80
-
/* Define this to enable morse code input */
81
-
#define HAVE_MORSE_INPUT
82
-
83
-
84
-
85
-
86
-
/* define this if you have a real-time clock */
87
-
//#define CONFIG_RTC RTC_RX5X348AB
88
-
89
-
/* define this if you have a disk storage, i.e. something
90
-
that needs spinups and can cause skips when shaked */
91
-
#define HAVE_DISK_STORAGE
92
-
93
-
/* Define this for LCD backlight available */
94
-
//#define HAVE_BACKLIGHT
95
-
96
-
//#define HAVE_BACKLIGHT_BRIGHTNESS
97
-
98
-
/* Main LCD backlight brightness range and defaults */
99
-
//#define MIN_BRIGHTNESS_SETTING 0
100
-
//#define MAX_BRIGHTNESS_SETTING 127
101
-
//#define DEFAULT_BRIGHTNESS_SETTING 85 /* OF "full brightness" */
102
-
//#define DEFAULT_DIMNESS_SETTING 22 /* OF "most dim" */
103
-
104
-
/* Define this if you have a software controlled poweroff */
105
-
//#define HAVE_SW_POWEROFF
106
-
//TODO: enable this back
107
-
108
-
/* The number of bytes reserved for loadable codecs */
109
-
#define CODEC_SIZE 0x100000
110
-
111
-
/* The number of bytes reserved for loadable plugins */
112
-
#define PLUGIN_BUFFER_SIZE 0x100000
113
-
114
-
/* Define this if you have the TLV320 audio codec -> controlled by the DSP */
115
-
#define HAVE_TLV320
116
-
117
-
#define CONFIG_I2C I2C_DM320
118
-
119
-
/* TLV320 has no tone controls, so we use the software ones */
120
-
#define HAVE_SW_TONE_CONTROLS
121
-
122
-
/*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \
123
-
SAMPR_CAP_11)*/
124
-
125
-
#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */
126
-
#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */
127
-
#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */
128
-
#define BATTERY_CAPACITY_INC 100 /* capacity increment */
129
-
#define BATTERY_TYPES_COUNT 1 /* only one type */
130
-
131
-
#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
132
-
133
-
/* Hardware controlled charging with monitoring */
134
-
//#define CONFIG_CHARGING CHARGING_MONITOR
135
-
136
-
/* Define this if you have a TI TMS320DM320 */
137
-
#define CONFIG_CPU DM320
138
-
139
-
/* define this if the hardware can be powered off while charging */
140
-
#define HAVE_POWEROFF_WHILE_CHARGING
141
-
142
-
/* The size of the flash ROM */
143
-
#define FLASH_SIZE 0x400000
144
-
145
-
/* Define this to the CPU frequency */
146
-
#define CPU_FREQ 16934400
147
-
148
-
/* Define this if you have ATA power-off control */
149
-
#define HAVE_ATA_POWER_OFF
150
-
151
-
/* Define this if you have adjustable CPU frequency */
152
-
/* #define HAVE_ADJUSTABLE_CPU_FREQ */
153
-
154
-
#define BOOTFILE_EXT "zv"
155
-
#define BOOTFILE "rockbox." BOOTFILE_EXT
156
-
#define BOOTDIR "/.rockbox"
157
-
158
-
#define CONFIG_USBOTG USBOTG_ISP1583
159
-
#define HAVE_USBSTACK
160
-
#define USB_VENDOR_ID 0x041e
161
-
#define USB_PRODUCT_ID 0x4133
162
-
#define USB_NUM_ENDPOINTS 7
163
-
164
-
/* Define this if a programmable hotkey is mapped */
165
-
#define HAVE_HOTKEY
+165
-1
firmware/export/config/zenvision.h
+165
-1
firmware/export/config/zenvision.h
···
1
-
#include "zenvisionm30gb.h"
1
+
/***************************************************************************
2
+
* __________ __ ___.
3
+
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4
+
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5
+
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6
+
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7
+
* \/ \/ \/ \/ \/
8
+
* $Id$
9
+
*
10
+
* Copyright (C) 2008 by Maurus Cuelenaere
11
+
*
12
+
* This program is free software; you can redistribute it and/or
13
+
* modify it under the terms of the GNU General Public License
14
+
* as published by the Free Software Foundation; either version 2
15
+
* of the License, or (at your option) any later version.
16
+
*
17
+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18
+
* KIND, either express or implied.
19
+
*
20
+
****************************************************************************/
21
+
22
+
/*
23
+
* This config file is for the Creative Zen Vision
24
+
*/
25
+
26
+
#define CONFIG_SDRAM_START 0x00900000
27
+
28
+
#define CREATIVE_ZV 1
29
+
30
+
#define MODEL_NAME "Creative Zen Vision"
31
+
32
+
/* This makes it part of the Creative Zen Vision family :) */
33
+
#define CREATIVE_ZVx 1
34
+
35
+
/* For Rolo and boot loader */
36
+
#define MODEL_NUMBER 28
37
+
38
+
/* define this if you use an ATA controller */
39
+
#define CONFIG_STORAGE STORAGE_ATA
40
+
41
+
/*define this if the ATA controller and method of USB access support LBA48 */
42
+
#define HAVE_LBA48
43
+
44
+
45
+
46
+
47
+
/* define this if you have a colour LCD */
48
+
#define HAVE_LCD_COLOR
49
+
50
+
/* define this if you have access to the quickscreen */
51
+
#define HAVE_QUICKSCREEN
52
+
53
+
/* define this if you would like tagcache to build on this target */
54
+
#define HAVE_TAGCACHE
55
+
56
+
/* define this if the target has volume keys which can be used in the lists */
57
+
//#define HAVE_VOLUME_IN_LIST
58
+
59
+
/* LCD dimensions */
60
+
#define CONFIG_LCD LCD_CREATIVEZVM
61
+
62
+
/* choose the lcd orientation. both work */
63
+
#define CONFIG_ORIENTATION SCREEN_PORTRAIT
64
+
65
+
#define LCD_WIDTH 640
66
+
#define LCD_HEIGHT 480
67
+
/* sqrt(640^2 + 480^2) / 2.5 = 320.0 */
68
+
#define LCD_DPI 320
69
+
70
+
#define LCD_DEPTH 16 /* 65k colours */
71
+
#define LCD_PIXELFORMAT RGB565 /* rgb565 */
72
+
73
+
/* Define this if your LCD can be enabled/disabled */
74
+
#define HAVE_LCD_ENABLE
75
+
76
+
#define CONFIG_KEYPAD CREATIVEZV_PAD
77
+
#define HAVE_HEADPHONE_DETECTION
78
+
//#define HAVE_TOUCHPAD
79
+
80
+
/* Define this to enable morse code input */
81
+
#define HAVE_MORSE_INPUT
82
+
83
+
84
+
85
+
86
+
/* define this if you have a real-time clock */
87
+
//#define CONFIG_RTC RTC_RX5X348AB
88
+
89
+
/* define this if you have a disk storage, i.e. something
90
+
that needs spinups and can cause skips when shaked */
91
+
#define HAVE_DISK_STORAGE
92
+
93
+
/* Define this for LCD backlight available */
94
+
//#define HAVE_BACKLIGHT
95
+
96
+
//#define HAVE_BACKLIGHT_BRIGHTNESS
97
+
98
+
/* Main LCD backlight brightness range and defaults */
99
+
//#define MIN_BRIGHTNESS_SETTING 0
100
+
//#define MAX_BRIGHTNESS_SETTING 127
101
+
//#define DEFAULT_BRIGHTNESS_SETTING 85 /* OF "full brightness" */
102
+
//#define DEFAULT_DIMNESS_SETTING 22 /* OF "most dim" */
103
+
104
+
/* Define this if you have a software controlled poweroff */
105
+
//#define HAVE_SW_POWEROFF
106
+
//TODO: enable this back
107
+
108
+
/* The number of bytes reserved for loadable codecs */
109
+
#define CODEC_SIZE 0x100000
110
+
111
+
/* The number of bytes reserved for loadable plugins */
112
+
#define PLUGIN_BUFFER_SIZE 0x100000
113
+
114
+
/* Define this if you have the TLV320 audio codec -> controlled by the DSP */
115
+
#define HAVE_TLV320
116
+
117
+
#define CONFIG_I2C I2C_DM320
118
+
119
+
/* TLV320 has no tone controls, so we use the software ones */
120
+
#define HAVE_SW_TONE_CONTROLS
121
+
122
+
/*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \
123
+
SAMPR_CAP_11)*/
124
+
125
+
#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */
126
+
#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */
127
+
#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */
128
+
#define BATTERY_CAPACITY_INC 100 /* capacity increment */
129
+
#define BATTERY_TYPES_COUNT 1 /* only one type */
130
+
131
+
#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
132
+
133
+
/* Hardware controlled charging with monitoring */
134
+
//#define CONFIG_CHARGING CHARGING_MONITOR
135
+
136
+
/* Define this if you have a TI TMS320DM320 */
137
+
#define CONFIG_CPU DM320
138
+
139
+
/* define this if the hardware can be powered off while charging */
140
+
#define HAVE_POWEROFF_WHILE_CHARGING
141
+
142
+
/* The size of the flash ROM */
143
+
#define FLASH_SIZE 0x400000
144
+
145
+
/* Define this to the CPU frequency */
146
+
#define CPU_FREQ 16934400
147
+
148
+
/* Define this if you have ATA power-off control */
149
+
#define HAVE_ATA_POWER_OFF
150
+
151
+
/* Define this if you have adjustable CPU frequency */
152
+
/* #define HAVE_ADJUSTABLE_CPU_FREQ */
153
+
154
+
#define BOOTFILE_EXT "zv"
155
+
#define BOOTFILE "rockbox." BOOTFILE_EXT
156
+
#define BOOTDIR "/.rockbox"
157
+
158
+
#define CONFIG_USBOTG USBOTG_ISP1583
159
+
#define HAVE_USBSTACK
160
+
#define USB_VENDOR_ID 0x041e
161
+
#define USB_PRODUCT_ID 0x4133
162
+
#define USB_NUM_ENDPOINTS 7
163
+
164
+
/* Define this if a programmable hotkey is mapped */
165
+
#define HAVE_HOTKEY
+1
-1
firmware/target/arm/system-arm.h
+1
-1
firmware/target/arm/system-arm.h
···
110
110
unsigned long cpsr;
111
111
int oldstatus;
112
112
/* Read the old levels and set the new ones */
113
-
#if defined(CREATIVE_ZVM) && defined(BOOTLOADER)
113
+
#if (defined(CREATIVE_ZVM) ||defined(CREATIVE_ZV)) && defined(BOOTLOADER)
114
114
// FIXME: This workaround is for a problem with inlining;
115
115
// for some reason 'mask' gets treated as a variable/non-immediate constant
116
116
// but only on this build. All others (including the nearly-identical mrobe500boot) are fine