len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

iAudio, iRiver: As both platforms use the same i2c interface i have renamed i2c-h100.c/h to i2c-coldfire.c/h. Also i have changed some stuff in config.h and config-xx.h. Hope everybody agrees with this patch, else we can unroll and improve it.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7271 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Christian Gmeiner 2005-07-31 17:31:33 +00:00
parent 6109a3b0be
commit 4894a06a15
8 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/SOURCES
View file

@ -79,8 +79,8 @@ drivers/fmradio_i2c.c
tuner_philips.c
#endif
#endif
#if CONFIG_I2C == I2C_H100
drivers/i2c-h100.c
#if CONFIG_I2C == I2C_COLDFIRE
drivers/i2c-coldfire.c
#else
drivers/i2c.c
#endif

12
firmware/drivers/i2c-h100.c → firmware/drivers/i2c-coldfire.c
View file

@ -21,7 +21,7 @@
#include "kernel.h"
#include "debug.h"
#include "system.h"
#include "i2c-h100.h"
#include "i2c-coldfire.h"
#define I2C_DEVICE_1 ((volatile unsigned char *)&MADR)
#define I2C_DEVICE_2 ((volatile unsigned char *)&MADR2)
@ -37,6 +37,7 @@ static volatile unsigned char *i2c_get_addr(int device);
void i2c_init(void)
{
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
/* Audio Codec */
MADR = 0x6c; /* iRiver firmware uses this addr */
MBDR = 0; /* iRiver firmware does this */
@ -48,22 +49,21 @@ void i2c_init(void)
MBDR2 = 0;
MBCR2 = IEN;
#endif
#endif
}
void i2c_close(void)
{
MBCR = 0;
#if 0
MBCR2 = 0;
#endif
}
/**
* Writes bytes to the selected device.
*
* Use device=1 for bus 1 at 0x40000280 (Audio Codec)
* Use device=2 for bus 2 at 0x80000440 (Tuner ?)
* Use device=1 for bus 1 at 0x40000280
* Use device=2 for bus 2 at 0x80000440
*
* Returns number of bytes successfully send or -1 if START failed
*/

3
firmware/export/config-h100.h
View file

@ -52,7 +52,8 @@
/* Define this if you have a Motorola SCF5249 */
#define CONFIG_CPU MCF5249
#define CONFIG_I2C I2C_H100
/* Define this if you want to use coldfire's i2c interface */
#define CONFIG_I2C I2C_COLDFIRE
#define HAVE_UDA1380

3
firmware/export/config-h120.h
View file

@ -48,7 +48,8 @@
/* Define this if you have a Motorola SCF5249 */
#define CONFIG_CPU MCF5249
#define CONFIG_I2C I2C_H100
/* Define this if you want to use coldfire's i2c interface */
#define CONFIG_I2C I2C_COLDFIRE
#define HAVE_UDA1380

3
firmware/export/config-h300.h
View file

@ -44,7 +44,8 @@
/* Define this if you have a Motorola SCF5249 */
#define CONFIG_CPU MCF5249
#define CONFIG_I2C I2C_H100
/* Define this if you want to use coldfire's i2c interface */
#define CONFIG_I2C I2C_COLDFIRE
#define HAVE_UDA1380

5
firmware/export/config-iaudiox5.h
View file

@ -42,10 +42,11 @@
#ifndef SIMULATOR
/* Define this if you have a Motorola SCF5249 */
/* Define this if you have a Motorola SCF5250 */
#define CONFIG_CPU MCF5250
#define CONFIG_I2C I2C_IAUDIO
/* Define this if you want to use coldfire's i2c interface */
#define CONFIG_I2C I2C_COLDFIRE
#define HAVE_TLV320

3
firmware/export/config.h
View file

@ -81,8 +81,7 @@
#define I2C_PLAYREC 0 /* Archos Player/Recorder style */
#define I2C_ONDIO 1 /* Ondio style */
#define I2C_GMINI 2 /* Gmini style */
#define I2C_H100 3 /* iRiver h100 style */
#define I2C_IAUDIO 4 /* iAuido style */
#define I2C_COLDFIRE 3 /* Coldfire style */
/* CONFIG_LED */
#define LED_REAL 1 /* SW controlled LED (Archos recorders, player, Gmini) */

6
firmware/export/i2c-h100.h → firmware/export/i2c-coldfire.h
View file

@ -18,13 +18,13 @@
****************************************************************************/
/*
* Driver for MCF5249's I2C interface
* Driver for MCF52xx's I2C interface
* 2005-02-17 hubble@mochine.com
*
*/
#ifndef _I2C_H100_H
#define _I2C_H100_H
#ifndef _I2C_COLDFIRE_H
#define _I2C_COLDFIRE_H
void i2c_init(void);
int i2c_write(int device, unsigned char *buf, int count);