Index: rockbox/apps/playback.c =================================================================== --- rockbox/apps/playback.c (revision 17568) +++ rockbox/apps/playback.c (working copy) @@ -79,6 +79,10 @@ #include "talk.h" #endif +#ifdef IPOD_ACCESSORY_PROTOCOL +#include "iap.h" +#endif + #define PLAYBACK_VOICE /* default point to start buffer refill */ @@ -638,6 +642,9 @@ { if (track_changed) { +#ifdef IPOD_ACCESSORY_PROTOCOL + iap_track_changed(); +#endif track_changed = false; return true; } Index: rockbox/apps/SOURCES =================================================================== --- rockbox/apps/SOURCES (revision 17568) +++ rockbox/apps/SOURCES (working copy) @@ -45,6 +45,9 @@ #endif filetree.c scrobbler.c +#ifdef IPOD_ACCESSORY_PROTOCOL +iap.c +#endif screen_access.c gui/buttonbar.c Index: rockbox/apps/iap.c =================================================================== --- rockbox/apps/iap.c (revision 0) +++ rockbox/apps/iap.c (revision 0) @@ -0,0 +1,613 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: iap.c 17400 2008-05-07 14:30:29Z xxxxxx $ + * + * Copyright (C) 2002 by Alan Korr & Nick Robinson + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include +#include +#include +#include +#include + +#include "iap.h" +#include "button.h" +#include "config.h" +#include "cpu.h" +#include "system.h" +#include "kernel.h" +#include "serial.h" + +#include "playlist.h" +#include "playback.h" +#include "audio.h" +#include "settings.h" +#include "metadata.h" +#include "gwps.h" + +#include "button.h" +#include "action.h" + +#define RX_BUFLEN 260 +#define TX_BUFLEN 128 + +static volatile int iap_pollspeed = 0; +static volatile bool iap_remotetick = true; +static bool iap_setupflag = false, iap_updateflag = false; +static int iap_changedctr = 0; + +static unsigned long iap_remotebtn = 0; +static int iap_repeatbtn = 0; + +unsigned char serbuf[RX_BUFLEN]; +static int serbuf_i = 0; + +static unsigned char response[TX_BUFLEN]; +static int responselen; + +static void iap_task(void) +{ + static int count = 0; + + count += iap_pollspeed; + if (count < (500/10)) return; + + /* exec every 500ms if pollspeed == 1 */ + count = 0; + queue_post(&button_queue, SYS_IAP_PERIODIC, 0); +} + +void iap_setup(void) +{ +// asm(" nop"); +// asm(" nop"); +// asm(" nop"); +// asm(" nop"); +// asm(" nop"); +// asm(" nop"); +// asm(" nop"); +// asm(" nop"); +// asm(" nop"); +// asm(" nop"); + + iap_pollspeed = 0; + iap_remotetick = true; + iap_updateflag = false; + iap_changedctr = 0; + iap_setupflag = true; + iap_remotebtn = BUTTON_NONE; + tick_add_task(iap_task); +} + +/* Message format: + 0xff + 0x55 + length + mode + command (2 bytes) + parameters (0-n bytes) + checksum (length+mode+parameters+checksum == 0) +*/ + +void iap_send_pkt(unsigned char * data, int len) +{ + int i, chksum; + + if(len > TX_BUFLEN-4) len = TX_BUFLEN-4; + responselen = len + 4; + + response[0] = 0xFF; + response[1] = 0x55; + + chksum = response[2] = len; + for(i = 0; i < len; i ++) + { + chksum += data[i]; + response[i+3] = data[i]; + } + + response[i+3] = 0x100 - (chksum & 0xFF); + + for(i = 0; i < responselen; i ++) + { + while (!tx_rdy()) ; + tx_writec(response[i]); + } +} + +void iap_getc(unsigned char x) +{ + static unsigned char last_x = 0; + static unsigned char chksum = 0; + + /* Restart if the sync word is seen */ + if(x == 0x55 && last_x == 0xff) + { + serbuf[0] = 0; + serbuf_i = 0; + chksum = 0; + } + else + { + if(serbuf_i >= RX_BUFLEN) + serbuf_i = 0; + + serbuf[serbuf_i++] = x; + chksum += x; + } + last_x = x; + + /* Broadcast to queue if we have a complete message */ + if(serbuf_i && (serbuf_i == serbuf[0]+2) && chksum == 0) + { + serbuf_i = 0; + queue_post(&button_queue, SYS_IAP_HANDLEPKT, 0); + } +} + +void iap_track_changed(void) +{ + iap_changedctr = 1; +} + +void iap_periodic(void) +{ + if(!iap_setupflag) return; + if(!iap_pollspeed) return; + + unsigned char data[] = {0x04, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00}; + unsigned long time_elapsed = audio_current_track()->elapsed; + + time_elapsed += wps_state.ff_rewind_count; + + data[3] = 0x04; // playing + + /* If info has changed, don't flag it right away */ + if(iap_changedctr && iap_changedctr++ >= iap_pollspeed * 2) + { + /* track info has changed */ + iap_changedctr = 0; + data[3] = 0x02; // 0x01 has same effect? + iap_updateflag = true; + } + + data[4] = time_elapsed >> 24; + data[5] = time_elapsed >> 16; + data[6] = time_elapsed >> 8; + data[7] = time_elapsed; + iap_send_pkt(data, sizeof(data)); +} + +void iap_handlepkt(void) +{ + + if(!iap_setupflag) return; + if(serbuf[0] == 0) return; + + /* if we are waiting for a remote button to go out, + delay the handling of the new packet */ + if(!iap_remotetick) + { + queue_post(&button_queue, SYS_IAP_HANDLEPKT, 0); + return; + } + + /* Handle Mode 0 */ + if (serbuf[1] == 0x00) + { + switch (serbuf[2]) + { + /* get model info */ + case 0x0D: + { + unsigned char data[] = {0x00, 0x0E, 0x00, 0x0B, 0x00, 0x10, + 'R', 'O', 'C', 'K', 'B', 'O', 'X', 0x00}; + iap_send_pkt(data, sizeof(data)); + break; + } + /* No idea ??? */ + case 0x0F: + { + unsigned char data[] = {0x00, 0x10, 0x00, 0x01, 0x05}; + iap_send_pkt(data, sizeof(data)); + break; + } + /* default response is with cmd ok packet */ + default: + { + unsigned char data[] = {0x00, 0x02, 0x00, 0x00}; + data[3] = serbuf[2]; //respond with cmd + iap_send_pkt(data, sizeof(data)); + break; + } + } + } + /* Handle Mode 2 */ + else if (serbuf[1] == 0x02) + { + if(serbuf[2] != 0) return; + if(serbuf[3] == 0 && serbuf[0] == 6) + { + switch(serbuf[4]) + { + case 1: /* play */ + if (audio_status() != AUDIO_STATUS_PLAY) + { + iap_remotebtn = BUTTON_RC_PLAY; + iap_repeatbtn = 2; + iap_remotetick = false; + iap_changedctr = 1; + } + break; + case 2: /* pause */ + if (audio_status() == AUDIO_STATUS_PLAY) + { + iap_remotebtn = BUTTON_RC_PLAY; + iap_repeatbtn = 2; + iap_remotetick = false; + iap_changedctr = 1; + } + break; + } + } + else + { + switch(serbuf[3]) + { + case 1: + iap_remotebtn = BUTTON_RC_PLAY; + break; + case 2: + iap_remotebtn = BUTTON_RC_VOL_UP; + break; + case 4: + iap_remotebtn = BUTTON_RC_VOL_DOWN; + break; + case 8: + iap_remotebtn = BUTTON_RC_RIGHT; + break; + case 16: + iap_remotebtn = BUTTON_RC_LEFT; + break; + default: + iap_remotebtn = BUTTON_NONE; + } + iap_remotetick = false; + } + } + /* Handle Mode 3 */ + else if (serbuf[1] == 0x03) + { + switch(serbuf[2]) + { + /* some kind of status packet? */ + case 0x01: + { + unsigned char data[] = {0x03, 0x02, 0x00, 0x00, 0x00, 0x00}; + iap_send_pkt(data, sizeof(data)); + break; + } + } + } + /* Handle Mode 4 */ + else if (serbuf[1] == 0x04) + { + switch (((unsigned long)serbuf[2] << 8) | serbuf[3]) + { + /* Get data updated??? flag */ + case 0x0009: + { + unsigned char data[] = {0x04, 0x00, 0x0A, 0x00}; + data[3] = iap_updateflag ? 0 : 1; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Set data updated??? flag */ + case 0x000B: + { + iap_updateflag = serbuf[4] ? 0 : 1; + /* respond with cmd ok packet */ + unsigned char data[] = {0x04, 0x00, 0x01, 0x00, 0x00, 0x0B}; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Get iPod size? */ + case 0x0012: + { + unsigned char data[] = {0x04, 0x00, 0x13, 0x01, 0x0B}; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Get count of given types */ + case 0x0018: + { + unsigned char data[] = {0x04, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00}; + unsigned long num = 0; + switch(serbuf[4]) /* type number */ + { + case 0x01: /* total number of playlists */ + num = 1; + break; + case 0x05: /* total number of songs */ + num = 1; + } + data[3] = num >> 24; + data[4] = num >> 16; + data[5] = num >> 8; + data[6] = num; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Get time and status */ + case 0x001C: + { + unsigned char data[] = {0x04, 0x00, 0x1D, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + struct mp3entry *id3 = audio_current_track(); + unsigned long time_total = id3->length; + unsigned long time_elapsed = id3->elapsed; + int status = audio_status(); + data[3] = time_total >> 24; + data[4] = time_total >> 16; + data[5] = time_total >> 8; + data[6] = time_total; + data[7] = time_elapsed >> 24; + data[8] = time_elapsed >> 16; + data[9] = time_elapsed >> 8; + data[10] = time_elapsed; + if (status == AUDIO_STATUS_PLAY) + data[11] = 0x01; /* play */ + else if (status & AUDIO_STATUS_PAUSE) + data[11] = 0x02; /* pause */ + iap_send_pkt(data, sizeof(data)); + break; + } + /* Get current pos in playlist */ + case 0x001E: + { + unsigned char data[] = {0x04, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00}; + long playlist_pos = playlist_next(0); + playlist_pos -= playlist_get_first_index(NULL); + if(playlist_pos < 0) + playlist_pos += playlist_amount(); + data[3] = playlist_pos >> 24; + data[4] = playlist_pos >> 16; + data[5] = playlist_pos >> 8; + data[6] = playlist_pos; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Get title of a song number */ + case 0x0020: + /* Get artist of a song number */ + case 0x0022: + /* Get album of a song number */ + case 0x0024: + { + unsigned char data[70] = {0x04, 0x00, 0xFF}; + struct mp3entry id3; + int fd; + long tracknum = (signed long)serbuf[4] << 24 | + (signed long)serbuf[5] << 16 | + (signed long)serbuf[6] << 8 | serbuf[7]; + data[2] = serbuf[3] + 1; + memcpy(&id3, audio_current_track(), sizeof(id3)); + tracknum += playlist_get_first_index(NULL); + if(tracknum >= playlist_amount()) + tracknum -= playlist_amount(); + + /* If the tracknumber is not the current one, + read id3 from disk */ + if(playlist_next(0) != tracknum) + { + struct playlist_track_info info; + playlist_get_track_info(NULL, tracknum, &info); + fd = open(info.filename, O_RDONLY); + memset(&id3, 0, sizeof(struct mp3entry)); + get_metadata(&id3, fd, info.filename); + close(fd); + } + + /* Return the requested track data */ + switch(serbuf[3]) + { + case 0x20: + strncpy(&data[3], id3.title, 64); + iap_send_pkt(data, 4+strlen(id3.title)); + break; + case 0x22: + strncpy(&data[3], id3.artist, 64); + iap_send_pkt(data, 4+strlen(id3.artist)); + break; + case 0x24: + strncpy(&data[3], id3.album, 64); + iap_send_pkt(data, 4+strlen(id3.album)); + break; + } + break; + } + /* Set polling mode */ + case 0x0026: + { + iap_pollspeed = serbuf[4] ? 1 : 0; + /*responsed with cmd ok packet */ + unsigned char data[] = {0x04, 0x00, 0x01, 0x00, 0x00, 0x26}; + iap_send_pkt(data, sizeof(data)); + break; + } + /* AiR playback control */ + case 0x0029: + { + /* respond with cmd ok packet */ + unsigned char data[] = {0x04, 0x00, 0x01, 0x00, 0x00, 0x29}; + iap_send_pkt(data, sizeof(data)); + switch(serbuf[4]) + { + case 0x01: /* play/pause */ + iap_remotebtn = BUTTON_RC_PLAY; + iap_repeatbtn = 2; + iap_remotetick = false; + iap_changedctr = 1; + break; + case 0x02: /* stop */ + iap_remotebtn = BUTTON_RC_PLAY|BUTTON_REPEAT; + iap_repeatbtn = 2; + iap_remotetick = false; + iap_changedctr = 1; + break; + case 0x03: /* skip++ */ + iap_remotebtn = BUTTON_RC_RIGHT; + iap_repeatbtn = 2; + iap_remotetick = false; + break; + case 0x04: /* skip-- */ + iap_remotebtn = BUTTON_RC_LEFT; + iap_repeatbtn = 2; + iap_remotetick = false; + break; + case 0x05: /* ffwd */ + iap_remotebtn = BUTTON_RC_RIGHT; + iap_remotetick = false; + if(iap_pollspeed) iap_pollspeed = 5; + break; + case 0x06: /* frwd */ + iap_remotebtn = BUTTON_RC_LEFT; + iap_remotetick = false; + if(iap_pollspeed) iap_pollspeed = 5; + break; + case 0x07: /* end ffwd/frwd */ + iap_remotebtn = BUTTON_NONE; + iap_remotetick = false; + if(iap_pollspeed) iap_pollspeed = 1; + break; + } + break; + } + /* Get shuffle mode */ + case 0x002C: + { + unsigned char data[] = {0x04, 0x00, 0x2D, 0x00}; + data[3] = global_settings.playlist_shuffle ? 1 : 0; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Set shuffle mode */ + case 0x002E: + { + if(serbuf[4] && !global_settings.playlist_shuffle) + { + global_settings.playlist_shuffle = 1; + settings_save(); + settings_apply(false); + if (audio_status() & AUDIO_STATUS_PLAY) + playlist_randomise(NULL, current_tick, true); + } + else if(!serbuf[4] && global_settings.playlist_shuffle) + { + global_settings.playlist_shuffle = 0; + settings_save(); + settings_apply(false); + if (audio_status() & AUDIO_STATUS_PLAY) + playlist_sort(NULL, true); + } + + + /* respond with cmd ok packet */ + unsigned char data[] = {0x04, 0x00, 0x01, 0x00, 0x00, 0x2E}; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Get repeat mode */ + case 0x002F: + { + unsigned char data[] = {0x04, 0x00, 0x30, 0x00}; + if(global_settings.repeat_mode == REPEAT_OFF) + data[3] = 0; + else if(global_settings.repeat_mode == REPEAT_ONE) + data[3] = 1; + else + data[3] = 2; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Set repeat mode */ + case 0x0031: + { + int oldmode = global_settings.repeat_mode; + if (serbuf[4] == 0) + global_settings.repeat_mode = REPEAT_OFF; + else if (serbuf[4] == 1) + global_settings.repeat_mode = REPEAT_ONE; + else if (serbuf[4] == 2) + global_settings.repeat_mode = REPEAT_ALL; + + if (oldmode != global_settings.repeat_mode) + { + settings_save(); + settings_apply(false); + if (audio_status() & AUDIO_STATUS_PLAY) + audio_flush_and_reload_tracks(); + } + + /* respond with cmd ok packet */ + unsigned char data[] = {0x04, 0x00, 0x01, 0x00, 0x00, 0x31}; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Get Max Screen Size for Picture Upload??? */ + case 0x0033: + { + unsigned char data[] = {0x04, 0x00, 0x34, 0x01, 0x36, 0x00, 0xA8, 0x01}; + iap_send_pkt(data, sizeof(data)); + break; + } + /* Get number songs in current playlist */ + case 0x0035: + { + unsigned char data[] = {0x04, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00}; + unsigned long playlist_amt = playlist_amount(); + data[3] = playlist_amt >> 24; + data[4] = playlist_amt >> 16; + data[5] = playlist_amt >> 8; + data[6] = playlist_amt; + iap_send_pkt(data, sizeof(data)); + break; + } + default: + { + /* default response is with cmd ok packet */ + unsigned char data[] = {0x04, 0x00, 0x01, 0x00, 0x00, 0x00}; + data[4] = serbuf[2]; + data[5] = serbuf[3]; + iap_send_pkt(data, sizeof(data)); + break; + } + } + } + serbuf[0] = 0; +} + +int remote_control_rx(void) +{ + int btn = iap_remotebtn; + if(iap_repeatbtn) + { + iap_repeatbtn--; + if(!iap_repeatbtn) + iap_remotebtn = BUTTON_NONE; + } + iap_remotetick = true; + return btn; +} Index: rockbox/apps/main.c =================================================================== --- rockbox/apps/main.c (revision 17568) +++ rockbox/apps/main.c (working copy) @@ -71,6 +71,10 @@ #include "scrobbler.h" #include "icon.h" +#ifdef IPOD_ACCESSORY_PROTOCOL +#include "iap.h" +#endif + #if (CONFIG_CODEC == SWCODEC) #include "playback.h" #endif @@ -583,6 +587,9 @@ #if CONFIG_CHARGING car_adapter_mode_init(); #endif +#ifdef IPOD_ACCESSORY_PROTOCOL + iap_setup(); +#endif #ifdef HAVE_ACCESSORY_SUPPLY accessory_supply_set(global_settings.accessory_supply); #endif Index: rockbox/apps/keymaps/keymap-ipod.c =================================================================== --- rockbox/apps/keymaps/keymap-ipod.c (revision 17568) +++ rockbox/apps/keymaps/keymap-ipod.c (working copy) @@ -171,9 +171,62 @@ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) }; /* button_context_recscreen */ +#if BUTTON_REMOTE != 0 +/***************************************************************************** + * Remote control mappings + *****************************************************************************/ + +static const struct button_mapping remote_button_context_standard[] = { + { ACTION_STD_PREV, BUTTON_RC_LEFT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_RC_RIGHT, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_RC_STOP, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_RC_PLAY, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; + +static const struct button_mapping remote_button_context_wps[] = { + { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + + { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, + { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_SKIPNEXT, BUTTON_RC_RIGHT|BUTTON_REL, BUTTON_RC_RIGHT }, + { ACTION_WPS_SEEKFWD, BUTTON_RC_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, + { ACTION_WPS_STOPSEEK, BUTTON_RC_RIGHT|BUTTON_REL, BUTTON_RC_RIGHT|BUTTON_REPEAT }, + { ACTION_WPS_SKIPPREV, BUTTON_RC_LEFT|BUTTON_REL, BUTTON_RC_LEFT }, + { ACTION_WPS_SEEKBACK, BUTTON_RC_LEFT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_STOPSEEK, BUTTON_RC_LEFT|BUTTON_REL, BUTTON_RC_LEFT|BUTTON_REPEAT }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) +}; + + +static const struct button_mapping* get_context_mapping_remote( int context ) +{ + context ^= CONTEXT_REMOTE; + + switch (context) + { + case CONTEXT_WPS: + return remote_button_context_wps; + + default: + return remote_button_context_standard; + } +} +#endif /* BUTTON_REMOTE != 0 */ + /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ const struct button_mapping* get_context_mapping(int context) { +#if BUTTON_REMOTE != 0 + if (context&CONTEXT_REMOTE) + return get_context_mapping_remote(context); +#endif + switch (context) { case CONTEXT_STD: Index: rockbox/apps/misc.c =================================================================== --- rockbox/apps/misc.c (revision 17568) +++ rockbox/apps/misc.c (working copy) @@ -53,6 +53,10 @@ #include "playlist.h" #include "yesno.h" +#ifdef IPOD_ACCESSORY_PROTOCOL +#include "iap.h" +#endif + #ifdef HAVE_MMC #include "ata_mmc.h" #endif @@ -973,6 +977,14 @@ unplug_change(false); return SYS_PHONE_UNPLUGGED; #endif +#ifdef IPOD_ACCESSORY_PROTOCOL + case SYS_IAP_PERIODIC: + iap_periodic(); + return SYS_IAP_PERIODIC; + case SYS_IAP_HANDLEPKT: + iap_handlepkt(); + return SYS_IAP_HANDLEPKT; +#endif } return 0; } Index: rockbox/firmware/export/serial.h =================================================================== --- rockbox/firmware/export/serial.h (revision 17568) +++ rockbox/firmware/export/serial.h (working copy) @@ -23,5 +23,7 @@ extern void serial_setup (void); extern int remote_control_rx(void); extern void serial_tx(const unsigned char *buf); +extern void tx_writec(unsigned char c); +extern int tx_rdy(void); #endif Index: rockbox/firmware/export/kernel.h =================================================================== --- rockbox/firmware/export/kernel.h (revision 17568) +++ rockbox/firmware/export/kernel.h (working copy) @@ -75,6 +75,8 @@ #define SYS_REMOTE_UNPLUGGED MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 5) #define SYS_SCREENDUMP MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 0) #define SYS_CAR_ADAPTER_RESUME MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 1) +#define SYS_IAP_PERIODIC MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 2) +#define SYS_IAP_HANDLEPKT MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 3) #define IS_SYSEVENT(ev) ((ev & SYS_EVENT) == SYS_EVENT) Index: rockbox/firmware/export/config-ipodvideo.h =================================================================== --- rockbox/firmware/export/config-ipodvideo.h (revision 17568) +++ rockbox/firmware/export/config-ipodvideo.h (working copy) @@ -184,4 +184,6 @@ #define ICODE_ATTR_TREMOR_NOT_MDCT +#define IPOD_ACCESSORY_PROTOCOL + #endif Index: rockbox/firmware/export/iap.h =================================================================== --- rockbox/firmware/export/iap.h (revision 0) +++ rockbox/firmware/export/iap.h (revision 0) @@ -0,0 +1,30 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: iap.h 17400 2008-05-07 20:22:16Z xxxxxx $ + * + * Copyright (C) 2002 by Alan Korr + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef __IAP_H__ +#define __IAP_H__ + +extern void iap_getc(unsigned char x); +extern void iap_write_pkt(unsigned char data, int len); +extern void iap_setup(void); +extern void iap_periodic(void); +extern void iap_handlepkt(void); +extern void iap_track_changed(void); + +#endif Index: rockbox/firmware/export/config-ipodnano.h =================================================================== --- rockbox/firmware/export/config-ipodnano.h (revision 17568) +++ rockbox/firmware/export/config-ipodnano.h (working copy) @@ -169,4 +169,6 @@ #define ICODE_ATTR_TREMOR_NOT_MDCT +#define IPOD_ACCESSORY_PROTOCOL + #endif Index: rockbox/firmware/target/arm/ipod/button-target.h =================================================================== --- rockbox/firmware/target/arm/ipod/button-target.h (revision 17568) +++ rockbox/firmware/target/arm/ipod/button-target.h (working copy) @@ -47,7 +47,22 @@ |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_SCROLL_FWD\ |BUTTON_SCROLL_BACK|BUTTON_PLAY) + /* Remote control's buttons */ +#ifdef IPOD_ACCESSORY_PROTOCOL +#define BUTTON_RC_PLAY 0x00100000 +#define BUTTON_RC_STOP 0x00080000 + +#define BUTTON_RC_LEFT 0x00040000 +#define BUTTON_RC_RIGHT 0x00020000 +#define BUTTON_RC_VOL_UP 0x00010000 +#define BUTTON_RC_VOL_DOWN 0x00008000 + +#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ + |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ + |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) +#else #define BUTTON_REMOTE 0 +#endif /* This is for later #define BUTTON_SCROLL_TOUCH 0x00000200 Index: rockbox/firmware/target/arm/ipod/button-clickwheel.c =================================================================== --- rockbox/firmware/target/arm/ipod/button-clickwheel.c (revision 17568) +++ rockbox/firmware/target/arm/ipod/button-clickwheel.c (working copy) @@ -314,7 +314,11 @@ } /* The int_btn variable is set in the button interrupt handler */ +#ifdef IPOD_ACCESSORY_PROTOCOL + return int_btn | remote_control_rx(); +#else return int_btn; +#endif } bool button_hold(void) Index: rockbox/firmware/target/arm/system-pp502x.c =================================================================== --- rockbox/firmware/target/arm/system-pp502x.c (revision 17568) +++ rockbox/firmware/target/arm/system-pp502x.c (working copy) @@ -28,6 +28,7 @@ #ifndef BOOTLOADER extern void TIMER1(void); extern void TIMER2(void); +extern void SERIAL0(void); extern void ipod_mini_button_int(void); /* iPod Mini 1st gen only */ extern void ipod_4g_button_int(void); /* iPod 4th gen and higher only */ extern void microsd_int(void); /* Sansa E200 and C200 */ @@ -77,6 +78,11 @@ button_int(); } #endif +#ifdef IPOD_ACCESSORY_PROTOCOL + else if (CPU_HI_INT_STAT & SER0_MASK) { + SERIAL0(); + } +#endif #ifdef HAVE_USBSTACK else if (CPU_INT_STAT & USB_MASK) { usb_drv_int(); Index: rockbox/firmware/drivers/serial.c =================================================================== --- rockbox/firmware/drivers/serial.c (revision 17568) +++ rockbox/firmware/drivers/serial.c (working copy) @@ -16,7 +16,9 @@ * KIND, either express or implied. * ****************************************************************************/ +#include #include +#include #include "button.h" #include "config.h" #include "cpu.h" @@ -26,6 +28,7 @@ #include "adc.h" #include "lcd.h" #include "serial.h" +#include "iap.h" #if CONFIG_CPU == IMX31L #include "serial-imx31.h" @@ -66,6 +69,35 @@ SCR1 = 0x10; /* Enable the receiver, no interrupt */ } +int tx_rdy(void) +{ + /* a dummy */ + return 1; +} + +int rx_rdy(void) +{ + if(SSR1 & SCI_RDRF) + return 1; + else + return 0; +} + +void tx_writec(unsigned char c) +{ + /* a dummy */ +} + +unsigned char rx_readc(void) +{ + char tmp; + /* Read byte and clear the Rx Full bit */ + tmp = RDR1; + and_b(~SCI_RDRF, &SSR1); + return tmp; +} + + /* This function returns the received remote control code only if it is received without errors before or after the reception. It therefore returns the received code on the second call after the @@ -85,11 +117,9 @@ return BUTTON_NONE; } - if(SSR1 & SCI_RDRF) { - /* Read byte and clear the Rx Full bit */ - btn = RDR1; - and_b(~SCI_RDRF, &SSR1); - + if(rx_rdy()) { + btn = rx_readc(); + if(last_was_error) { last_valid_button = BUTTON_NONE; @@ -147,16 +177,6 @@ #endif /* !HAVE_FMADC && !HAVE_MMC */ #elif defined(CPU_COLDFIRE) && defined(HAVE_SERIAL) -void serial_tx(const unsigned char *buf) -{ - while(*buf) { - while(!(USR0 & 0x04)) - { - }; - UTB0 = *buf++; - } -} - void serial_setup (void) { UCR0 = 0x30; /* Reset transmitter */ @@ -169,6 +189,25 @@ UCR0 = 0x04; /* Tx enable */ } +int tx_rdy(void) +{ + if(USR0 & 0x04) + return 1; + else + return 0; +} + +int rx_rdy(void) +{ + /* a dummy */ + return 0; +} + +void tx_writec(unsigned char c) +{ + UTB0 = c; +} + #elif (CONFIG_CPU == IMX31L) void serial_setup(void) @@ -205,11 +244,120 @@ return 0; } -void tx_writec(char c) +void tx_writec(unsigned char c) { UTXD1=(int) c; } +#elif defined(IPOD_ACCESSORY_PROTOCOL) +void serial_setup (void) +{ + int tmp; + +#if 0 + SER1_LCR = 0x80; /* Divisor latch enable */ + SER1_DLL = 0x4c; /* 24000000/76/16 = 19736 baud */ + SER1_DLM = 0x00; + SER1_LCR = 0x03; /* Latch disable, 8 bits */ + SER1_FCR = 0x07; /* Tx+Rx FIFO reset and FIFO enable */ + + outl(0x70000014, (inl(0x70000014) & ~0xf00) | 0xa00); + GPIOD_ENABLE &= ~6; + + DEV_EN = DEV_EN | DEV_SER1; + tmp = SER1_RBR; + DEV_RS |= DEV_SER1; + sleep(1); + DEV_RS &= ~DEV_SER1; +#endif + +#if MODEL_NUMBER == 8 + + /* Route the Tx/Rx pins. 4G Ipod??? */ + outl(0x70000018, inl(0x70000018) & ~0xc00); +#else if MODEL_NUMBER == 4 || MODEL_NUMBER == 5 + + /* Route the Tx/Rx pins. 5G Ipod */ + (*(volatile unsigned long *)(0x7000008C)) &= ~0x0C; + GPO32_ENABLE &= ~0x0C; +#endif + + DEV_EN = DEV_EN | DEV_SER0; + CPU_HI_INT_CLR = SER0_MASK; + + DEV_RS |= DEV_SER0; + sleep(1); + DEV_RS &= ~DEV_SER0; + + SER0_LCR = 0x80; /* Divisor latch enable */ + SER0_DLL = 0x4c; /* 24000000/76/16 = 19736 baud */ + SER0_DLM = 0x00; + SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */ + SER0_IER = 0x01; + + SER0_FCR = 0x07; /* Tx+Rx FIFO reset and FIFO enable */ + + CPU_INT_EN |= HI_MASK; + CPU_HI_INT_EN |= SER0_MASK; + tmp = SER0_RBR; +} + +int tx_rdy(void) +{ + if((SER0_LSR & 0x20)) + return 1; + else + return 0; +} + +int rx_rdy(void) +{ + if((SER0_LSR & 0x1)) + return 1; + else + return 0; +} + +void tx_writec(unsigned char c) +{ + SER0_THR =(int) c; +} + +unsigned char rx_readc(void) +{ + return (SER0_RBR & 0xFF); +} + +void SERIAL0(void) +{ + while(rx_rdy()) iap_getc(rx_readc()); +} + +#else /* Other targets */ +void serial_setup (void) +{ + /* a dummy */ +} + +int tx_rdy(void) +{ + /* a dummy */ + return 1; +} + +int rx_rdy(void) +{ + /* a dummy */ + return 0; +} + +void tx_writec(unsigned char c) +{ + /* a dummy */ +} + +#endif + void dprintf(const char * str, ... ) { char dprintfbuff[256]; @@ -239,10 +387,3 @@ } } } - -#else /* Other targets */ -void serial_setup (void) -{ - /* a dummy */ -} -#endif