diff options
author | Daniel Stenberg <daniel@haxx.se> | 2003-12-12 13:29:11 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2003-12-12 13:29:11 +0000 |
commit | 8d69f78423978e20997b34709d5b6d39896c9237 (patch) | |
tree | 832f08660866319636f16b91ca89e46153cc5bf6 /firmware/export | |
parent | c4b73634fe6cafebcb4a4f33ae392d73f81cb757 (diff) | |
download | rockbox-8d69f78423978e20997b34709d5b6d39896c9237.tar.gz rockbox-8d69f78423978e20997b34709d5b6d39896c9237.zip |
Additional Neo support
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4132 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/button.h | 48 | ||||
-rw-r--r-- | firmware/export/config-fmrecorder.h | 3 | ||||
-rw-r--r-- | firmware/export/config-player.h | 3 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 3 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 3 | ||||
-rw-r--r-- | firmware/export/config.h | 4 | ||||
-rw-r--r-- | firmware/export/lcd.h | 20 |
7 files changed, 82 insertions, 2 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index e3c37f9382..d6503d93b7 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -30,8 +30,49 @@ void button_init (void); | |||
30 | int button_get (bool block); | 30 | int button_get (bool block); |
31 | int button_get_w_tmo(int ticks); | 31 | int button_get_w_tmo(int ticks); |
32 | 32 | ||
33 | /* Shared button codes */ | ||
34 | #define BUTTON_NONE 0x0000 | 33 | #define BUTTON_NONE 0x0000 |
34 | |||
35 | #ifdef HAVE_NEO_KEYPAD | ||
36 | |||
37 | #define BUTTON_UP 0x0080 | ||
38 | #define BUTTON_DOWN 0x0010 | ||
39 | #define BUTTON_LEFT 0x0001 | ||
40 | #define BUTTON_RIGHT 0x0002 | ||
41 | |||
42 | #define BUTTON_SELECT 0x0040 | ||
43 | #define BUTTON_PROGRAM 0x0020 | ||
44 | #define BUTTON_MENU 0x0004 | ||
45 | #define BUTTON_PLAY 0x0008 | ||
46 | #define BUTTON_STOP 0x0100 | ||
47 | |||
48 | #define BUTTON_IR 0x2000 | ||
49 | #define BUTTON_REPEAT 0x4000 | ||
50 | #define BUTTON_REL 0x8000 | ||
51 | |||
52 | #define BUTTON_FLAG_MASK 0xF000 | ||
53 | #define BUTTON_MASK 0x0FFF | ||
54 | #define BUTTON_ALL BUTTON_MASK | ||
55 | #define BUTTON_ALL_FLAGS BUTTON_FLAG_MASK | ||
56 | |||
57 | #define NEO_IR_BUTTON_POWER 0x0001 | ||
58 | #define NEO_IR_BUTTON_SETTING 0x0002 | ||
59 | #define NEO_IR_BUTTON_REWIND 0x0004 | ||
60 | #define NEO_IR_BUTTON_FFORWARD 0x0008 | ||
61 | #define NEO_IR_BUTTON_PLAY 0x0010 | ||
62 | #define NEO_IR_BUTTON_VOLUP 0x0020 | ||
63 | #define NEO_IR_BUTTON_VOLDN 0x0040 | ||
64 | #define NEO_IR_BUTTON_BROWSE 0x0080 | ||
65 | #define NEO_IR_BUTTON_EQ 0x0100 | ||
66 | #define NEO_IR_BUTTON_MUTE 0x0200 | ||
67 | #define NEO_IR_BUTTON_PROGRAM 0x0400 | ||
68 | #define NEO_IR_BUTTON_STOP 0x0800 | ||
69 | #define NEO_IR_BUTTON_NONE 0x0000 | ||
70 | |||
71 | #define NEO_IR_BUTTON_REPEAT 0x1000 | ||
72 | |||
73 | #else | ||
74 | |||
75 | /* Shared button codes */ | ||
35 | #define BUTTON_ON 0x0001 | 76 | #define BUTTON_ON 0x0001 |
36 | #define BUTTON_UP 0x0010 | 77 | #define BUTTON_UP 0x0010 |
37 | #define BUTTON_DOWN 0x0020 | 78 | #define BUTTON_DOWN 0x0020 |
@@ -69,4 +110,7 @@ int button_get_w_tmo(int ticks); | |||
69 | 110 | ||
70 | #endif /* HAVE_PLAYER_KEYPAD */ | 111 | #endif /* HAVE_PLAYER_KEYPAD */ |
71 | 112 | ||
72 | #endif | 113 | #endif /* HAVE_NEO_KEYPAD */ |
114 | |||
115 | #endif /* _BUTTON_H_ */ | ||
116 | |||
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index d7e6c8f8f7..738633dcc5 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -51,3 +51,6 @@ | |||
51 | 51 | ||
52 | /* How to detect USB */ | 52 | /* How to detect USB */ |
53 | #define USB_FMRECORDERSTYLE 1 | 53 | #define USB_FMRECORDERSTYLE 1 |
54 | |||
55 | /* Define this if the platform has batteries */ | ||
56 | #define HAVE_BATTERIES 1 | ||
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 04c8f8fc3d..45eb1e4f9b 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h | |||
@@ -34,3 +34,6 @@ | |||
34 | 34 | ||
35 | /* How to detect USB */ | 35 | /* How to detect USB */ |
36 | #define USB_PLAYERSTYLE 1 | 36 | #define USB_PLAYERSTYLE 1 |
37 | |||
38 | /* Define this if the platform has batteries */ | ||
39 | #define HAVE_BATTERIES 1 | ||
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 85b0c392df..38958a3f4d 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -42,3 +42,6 @@ | |||
42 | 42 | ||
43 | /* How to detect USB */ | 43 | /* How to detect USB */ |
44 | #define USB_RECORDERSTYLE 1 | 44 | #define USB_RECORDERSTYLE 1 |
45 | |||
46 | /* Define this if the platform has batteries */ | ||
47 | #define HAVE_BATTERIES 1 | ||
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index d7e6c8f8f7..738633dcc5 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -51,3 +51,6 @@ | |||
51 | 51 | ||
52 | /* How to detect USB */ | 52 | /* How to detect USB */ |
53 | #define USB_FMRECORDERSTYLE 1 | 53 | #define USB_FMRECORDERSTYLE 1 |
54 | |||
55 | /* Define this if the platform has batteries */ | ||
56 | #define HAVE_BATTERIES 1 | ||
diff --git a/firmware/export/config.h b/firmware/export/config.h index 0b0cd41723..091d392328 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -28,6 +28,10 @@ | |||
28 | #include "config-fmrecorder.h" | 28 | #include "config-fmrecorder.h" |
29 | #elif defined(ARCHOS_RECORDERV2) | 29 | #elif defined(ARCHOS_RECORDERV2) |
30 | #include "config-recorderv2.h" | 30 | #include "config-recorderv2.h" |
31 | #elif defined(NEO_35) | ||
32 | #include "config-neo35.h" | ||
33 | #elif defined(NEO_MSTATION) | ||
34 | #include "config-mstation.h" | ||
31 | #else | 35 | #else |
32 | /* no known platform */ | 36 | /* no known platform */ |
33 | #endif | 37 | #endif |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index f4fa3372cf..c4632a0282 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -143,5 +143,25 @@ extern int lcd_getstringsize(unsigned char *str, int *w, int *h); | |||
143 | 143 | ||
144 | #endif /* CHARCELLS / BITMAP */ | 144 | #endif /* CHARCELLS / BITMAP */ |
145 | 145 | ||
146 | /* These control codes may only work on the Neo LCD display */ | ||
147 | #ifdef HAVE_NEO_LCD | ||
148 | |||
149 | /* Cursor Control Instructions */ | ||
150 | #define LCD_OFFCUR 0x0C | ||
151 | #define LCD_LINECUR 0x0E | ||
152 | #define LCD_BLINKCUR 0x0D | ||
153 | #define LCD_COMBNCUR 0x0F | ||
154 | #define LCD_HOMECUR 0x02 | ||
155 | #define LCD_SHLFCUR 0x10 | ||
156 | #define LCD_SHRTCUR 0x14 | ||
157 | |||
158 | /* Display Control Instructions */ | ||
159 | #define LCD_CLEAR 0x01 | ||
160 | #define LCD_OFFDISP 0x08 | ||
161 | #define LCD_ONDISP 0x0C | ||
162 | #define LCD_SHLFDISP 0x18 | ||
163 | #define LCD_SHRTDISP 0x1C | ||
164 | #define LCD_SET_CGRAM 0x40 | ||
165 | #endif | ||
146 | 166 | ||
147 | #endif /* __LCD_H__ */ | 167 | #endif /* __LCD_H__ */ |