i2c patches
cover i2c patches
Attached some patches to cleanup i2c as discussed before. There might be some dependencies wrt ordering so please apply in order
Tested on MPC8536DS
Have fun, Frans.
PATCH 1/5 cmd_i2c.c: declared local functions as static
Declared all functions that were not called outside the file as static
--- common/cmd_i2c.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
common/cmd_i2c.c +14 -14
@@ -159,7 +159,7 @@ int i2c_set_bus_speed(unsigned int)* i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr} */ -int do_i2c_read (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_read (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {u_char chip;uint devaddr, alen, length;
@@ -211,7 +211,7 @@ int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])return 0 ; } -int do_i2c_md (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_md (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {u_char chip;uint addr, alen, length;
@@ -317,7 +317,7 @@ int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])* Syntax: * i2c mw {i2c_chip} {addr}{.0, .1, .2} {data} [{count}] */ -int do_i2c_mw (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_mw (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {uchar chip;ulong addr;
@@ -389,7 +389,7 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])* Syntax: * i2c crc32 {i2c_chip} {addr}{.0, .1, .2} {count} */ -int do_i2c_crc (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_crc (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {uchar chip;ulong addr;
@@ -592,7 +592,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])* Syntax: * i2c probe {addr}{.0, .1, .2} */ -int do_i2c_probe (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_probe (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {int j;#if defined(CONFIG_SYS_I2C_NOPROBES )
@@ -636,7 +636,7 @@ int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])* {length} - Number of bytes to read * {delay} - A DECIMAL number and defaults to 1000 uSec */ -int do_i2c_loop (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_loop (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {u_char chip;ulong alen;
@@ -756,7 +756,7 @@ static void decode_bits (u_char const b, char const *str[], int const do_once)* Syntax: * i2c sdram {i2c_chip} */ -int do_sdram (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) +static int do_sdram (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) {enum { unknown,EDO ,SDRAM ,DDR2 } type;
@@ -1233,7 +1233,7 @@ int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])#endif #if defined(CONFIG_I2C_MUX ) -int do_i2c_add_bus (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_add_bus (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) {int ret=0 ;
@@ -1264,7 +1264,7 @@ int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])#endif /* CONFIG_I2C_MUX */ #if defined(CONFIG_I2C_MULTI_BUS ) -int do_i2c_bus_num (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_bus_num (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) {int bus_idx, ret=0 ;
@@ -1282,7 +1282,7 @@ int do_i2c_bus_num(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) }#endif /* CONFIG_I2C_MULTI_BUS */ -int do_i2c_bus_speed (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_bus_speed (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) {int speed, ret=0 ;
@@ -1299,17 +1299,17 @@ int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])return ret; } -int do_i2c_mm (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_mm (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) {return mod_i2c_mem (cmdtp,1 , flag, argc, argv); } -int do_i2c_nm (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_nm (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) {return mod_i2c_mem (cmdtp,0 , flag, argc, argv); } -int do_i2c_reset (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) +static int do_i2c_reset (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) {i2c_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE );return 0 ;
@@ -1337,7 +1337,7 @@ static cmd_tbl_t cmd_i2c_sub[] = { U_BOOT_CMD_MKENT(speed, 1, 1, do_i2c_bus_speed, "", ""), }; -int do_i2c (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) +static int do_i2c (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) {cmd_tbl_t *c;
Signature · 1 line
1.6.4.2
PATCH 2/5 cmd_i2c: moved mispositioned comment for i2c md
In reply to Frans Meulenbroeks--- common/cmd_i2c.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
common/cmd_i2c.c +4 -4
@@ -148,10 +148,6 @@ int __def_i2c_set_bus_speed(unsigned int speed)int i2c_set_bus_speed (unsigned int ) __attribute__((weak,alias ("__def_i2c_set_bus_speed" ))); -/* -* Syntax: -* i2c md {i2c_chip} {addr}{.0, .1, .2} {len} -*/ #define DISP_LINE_LEN 16/*
@@ -211,6 +207,10 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])return 0 ; } +/* +* Syntax: +* i2c md {i2c_chip} {addr}{.0, .1, .2} {len} +*/ static int do_i2c_md (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {u_char chip;
Signature · 1 line
1.6.4.2
PATCH 3/5 cmd_i2c: moved a define to before the functions
In reply to Frans Meulenbroeks--- common/cmd_i2c.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
common/cmd_i2c.c +2 -2
@@ -130,6 +130,8 @@ DECLARE_GLOBAL_DATA_PTR;#endif +#define DISP_LINE_LEN 16 +/* TODO: Implement architecture-specific get/set functions */ unsigned int __def_i2c_get_bus_speed (void ) {
@@ -148,8 +150,6 @@ int __def_i2c_set_bus_speed(unsigned int speed)int i2c_set_bus_speed (unsigned int ) __attribute__((weak,alias ("__def_i2c_set_bus_speed" ))); -#define DISP_LINE_LEN 16 -/* * Syntax: * i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr}
Signature · 1 line
1.6.4.2
PATCH 4/5 cmd_i2c: introduced get_alen helper function
In reply to Frans MeulenbroeksThe code to parse alen appeared 6 times in the function. Factored this out in a small helper function
--- common/cmd_i2c.c | 119 +++++++++++++++++++++-------------------------------- 1 files changed, 47 insertions(+), 72 deletions(-)
common/cmd_i2c.c +47 -72
@@ -151,6 +151,29 @@ int i2c_set_bus_speed(unsigned int) __attribute__((weak, alias("__def_i2c_set_bus_speed")));/* +* get_alen: small parser helper function to get address length +* returns the address length,or 0 on error +*/ +static uint get_alen (char *arg) +{ +int j; +int alen; + + alen =1 ; +for (j =0 ; j <8 ; j++) { +if (arg[j] =='.' ) { + alen = arg[j+1 ] -'0' ; +if (alen >3 ) { +return 0 ; + } +break ; + }else if (arg[j] =='\0' ) +break ; + } +return alen; +} + +/* * Syntax: * i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr} */
@@ -160,7 +183,6 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])u_char chip;uint devaddr, alen, length;u_char *memaddr; -int j;if (argc !=5 ) {cmd_usage (cmdtp);
@@ -177,17 +199,10 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])* 2 bytes long. Some day it might be 3 bytes long :-). */ devaddr =simple_strtoul (argv[2 ],NULL ,16 ); - alen =1 ; -for (j =0 ; j <8 ; j++) { -if (argv[2 ][j] =='.' ) { - alen = argv[2 ][j+1 ] -'0' ; -if (alen >3 ) { -cmd_usage (cmdtp); -return 1 ; - } -break ; - }else if (argv[2 ][j] =='\0' ) -break ; + alen =get_alen (argv[2 ]); +if (alen ==0 ) { +cmd_usage (cmdtp); +return 1 ; }/*
@@ -234,7 +249,6 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])/* * New command specified. */ - alen =1 ;/* * I2C chip address
@@ -246,17 +260,10 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])* 2 bytes long. Some day it might be 3 bytes long :-). */ addr =simple_strtoul (argv[2 ],NULL ,16 ); - alen =1 ; -for (j =0 ; j <8 ; j++) { -if (argv[2 ][j] =='.' ) { - alen = argv[2 ][j+1 ] -'0' ; -if (alen >3 ) { -cmd_usage (cmdtp); -return 1 ; - } -break ; - }else if (argv[2 ][j] =='\0' ) -break ; + alen =get_alen (argv[2 ]); +if (alen ==0 ) { +cmd_usage (cmdtp); +return 1 ; }/*
@@ -324,7 +331,6 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])uint alen;uchar byte;int count; -int j;if ((argc <4 ) || (argc >5 )) {cmd_usage (cmdtp);
@@ -340,17 +346,10 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])* Address is always specified. */ addr =simple_strtoul (argv[2 ],NULL ,16 ); - alen =1 ; -for (j =0 ; j <8 ; j++) { -if (argv[2 ][j] =='.' ) { - alen = argv[2 ][j+1 ] -'0' ; -if (alen >3 ) { -cmd_usage (cmdtp); -return 1 ; - } -break ; - }else if (argv[2 ][j] =='\0' ) -break ; + alen =get_alen (argv[2 ]); +if (alen ==0 ) { +cmd_usage (cmdtp); +return 1 ; }/*
@@ -398,7 +397,6 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])uchar byte;ulong crc;ulong err; -int j;if (argc <4 ) {cmd_usage (cmdtp);
@@ -414,17 +412,10 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])* Address is always specified. */ addr =simple_strtoul (argv[2 ],NULL ,16 ); - alen =1 ; -for (j =0 ; j <8 ; j++) { -if (argv[2 ][j] =='.' ) { - alen = argv[2 ][j+1 ] -'0' ; -if (alen >3 ) { -cmd_usage (cmdtp); -return 1 ; - } -break ; - }else if (argv[2 ][j] =='\0' ) -break ; + alen =get_alen (argv[2 ]); +if (alen ==0 ) { +cmd_usage (cmdtp); +return 1 ; }/*
@@ -469,7 +460,6 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])ulong data;int size =1 ;int nbytes; -int j;extern char console_buffer[];if (argc !=3 ) {
@@ -504,17 +494,10 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])* Address is always specified. */ addr =simple_strtoul (argv[2 ],NULL ,16 ); - alen =1 ; -for (j =0 ; j <8 ; j++) { -if (argv[2 ][j] =='.' ) { - alen = argv[2 ][j+1 ] -'0' ; -if (alen >3 ) { -cmd_usage (cmdtp); -return 1 ; - } -break ; - }else if (argv[2 ][j] =='\0' ) -break ; + alen =get_alen (argv[2 ]); +if (alen ==0 ) { +cmd_usage (cmdtp); +return 1 ; } }
@@ -644,7 +627,6 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])uint length;u_char bytes[16 ];int delay; -int j;if (argc <3 ) {cmd_usage (cmdtp);
@@ -660,17 +642,10 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])* Address is always specified. */ addr =simple_strtoul (argv[2 ],NULL ,16 ); - alen =1 ; -for (j =0 ; j <8 ; j++) { -if (argv[2 ][j] =='.' ) { - alen = argv[2 ][j+1 ] -'0' ; -if (alen >3 ) { -cmd_usage (cmdtp); -return 1 ; - } -break ; - }else if (argv[2 ][j] =='\0' ) -break ; + alen =get_alen (argv[2 ]); +if (alen ==0 ) { +cmd_usage (cmdtp); +return 1 ; }/*
Signature · 1 line
1.6.4.2
[U-Boot] [PATCH 5/5:q i2c: made unused function i2c_mux_add_device static
In reply to Frans Meulenbroeksand removed it from the .h file
--- common/cmd_i2c.c | 2 +- include/i2c.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-)
common/cmd_i2c.c +1 -1
@@ -1357,7 +1357,7 @@ U_BOOT_CMD( );#if defined(CONFIG_I2C_MUX ) -int i2c_mux_add_device (I2C_MUX_DEVICE *dev) +static int i2c_mux_add_device (I2C_MUX_DEVICE *dev) {I2C_MUX_DEVICE *devtmp = i2c_mux_devices;
include/i2c.h +0 -2
@@ -127,8 +127,6 @@ typedef struct _mux_device {struct _mux_device *next; }I2C_MUX_DEVICE ; -int i2c_mux_add_device (I2C_MUX_DEVICE *dev); -I2C_MUX_DEVICE *i2c_mux_search_device (int id);I2C_MUX_DEVICE *i2c_mux_ident_muxstring (uchar *buf);int i2x_mux_select_mux (int bus);
Signature · 1 line
1.6.4.2
[U-Boot] [PATCH 5/5:q i2c: made unused function i2c_mux_add_device static
Apologies, apparently accidently mangled the command line. (actually there was an unrelated patch inbetween, so edited the subject line after creating the patch, and goofed. Guess you all know now what editor I'm using.
Patch does apply.
Frans
[U-Boot] [PATCH 5/5:q i2c: made unused function i2c_mux_add_device static
Hi Frans,
Quoted 1 line
Guess you all know now what editor I'm using.
Emacs in Viper mode? *lol*
Cheers
Detlev
Signature · 7 lines
Today people don't go to rock concerts to listen to the music, because
you can't. They go there to be part of the environment.
-- Peter Eisenman
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de