s3c24x0 code style changes
Subsystems (3)
PATCH v2 2/3 s3c24x0 code style changes
Changes the s3c24x0 files to meet the code style requirements.
---
v2 changes:
- re-number to be 2/3
checkpatch.pl reports no errors.
board/MAI/AmigaOneG3SE/video.c | 1 - board/mpl/common/common_util.h | 1 + board/mpl/common/flash.c | 1 - board/mpl/vcma9/cmd_vcma9.c | 9 - board/mpl/vcma9/vcma9.c | 27 ++-- board/mpl/vcma9/vcma9.h | 6 +- board/samsung/smdk2400/smdk2400.c | 12 +- board/sbc2410x/sbc2410x.c | 6 +- board/trab/auto_update.c | 30 +--- board/trab/cmd_trab.c | 213 +++++++++++------------- board/trab/rs485.c | 16 +- board/trab/trab.c | 43 ++--- board/trab/trab.h | 38 +++++ board/trab/trab_fkt.c | 331 ++++++++++++++++--------------------- board/trab/tsc2000.c | 12 +- board/trab/tsc2000.h | 1 + board/trab/vfd.c | 70 ++++---- common/cmd_version.c | 2 - common/cmd_vfd.c | 2 - common/main.c | 5 +- drivers/i2c/s3c24x0_i2c.c | 71 ++++----- drivers/video/cfb_console.c | 1 - include/common.h | 14 ++ lib_generic/display_options.c | 2 - 24 files changed, 418 insertions(+), 496 deletions(-) create mode 100644 board/trab/trab.h
board/MAI/AmigaOneG3SE/video.c +0 -1
@@ -478,7 +478,6 @@ void video_easteregg(void)#endif extern block_dev_desc_t *ide_get_dev (int dev); -extern char version_string[];void video_banner (void ) {
board/mpl/common/common_util.h +1 -0
@@ -42,4 +42,5 @@ void check_env(void);void doc_init (void );#endif +int do_mplcommon (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);#endif /* _COMMON_UTIL_H_ */
board/mpl/common/flash.c +0 -1
@@ -159,7 +159,6 @@ unsigned long flash_init (void)#if !defined(CONFIG_PATI )unsigned long size_b1,flashcr,size_reg;int mode; -extern char version_string;char *p = &version_string;/* Since we are relocated, we can set-up the CS finally */
board/mpl/vcma9/cmd_vcma9.c +0 -9
@@ -43,15 +43,6 @@ static uchar cs8900_chksum(ushort data)DECLARE_GLOBAL_DATA_PTR ; -extern void print_vcma9_info (void ); -extern int vcma9_cantest (int ); -extern int vcma9_nandtest (void ); -extern int vcma9_nanderase (void ); -extern int vcma9_nandread (ulong ); -extern int vcma9_nandwrite (ulong ); -extern int vcma9_dactest (int ); -extern int do_mplcommon (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]); -/* ------------------------------------------------------------------------- */ int do_vcma9 (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[])
board/mpl/vcma9/vcma9.c +12 -15
@@ -137,22 +137,19 @@ int board_init(void)* NAND flash initialization. */ #if defined(CONFIG_CMD_NAND ) -extern ulong -nand_probe (ulong physadr); - -static inline void NF_Reset (void ) {int i;NF_SetCE (NFCE_LOW ); -NF_Cmd (0xFF );/* reset command */ -for (i =0 ; i <10 ; i++);/* tWB = 100ns. */ -NF_WaitRB ();/* wait 200~500us; */ +NF_Cmd (0xFF );/* reset command */ +/* tWB = 100ns. */ +for (i =0 ; i <10 ; i++) +/* delay */ ; +NF_WaitRB ();/* wait 200~500us; */ NF_SetCE (NFCE_HIGH ); } -static inline void NF_Init (void ) {#define TACLS 0
@@ -187,36 +184,36 @@ static u8 Get_PLD_ID(void) {VCMA9_PLD *const pld =VCMA9_get_base_PLD (); -return (pld->ID); +return pld->ID; }static u8 Get_PLD_BOARD (void ) {VCMA9_PLD *const pld =VCMA9_get_base_PLD (); -return (pld->BOARD); +return pld->BOARD; }static u8 Get_PLD_SDRAM (void ) {VCMA9_PLD *const pld =VCMA9_get_base_PLD (); -return (pld->SDRAM); +return pld->SDRAM; }static u8 Get_PLD_Version (void ) { -return ((Get_PLD_ID () >>4 ) &0x0F ); +return (Get_PLD_ID () >>4 ) &0x0F ; }static u8 Get_PLD_Revision (void ) { -return (Get_PLD_ID () &0x0F ); +return Get_PLD_ID () &0x0F ; }static uchar Get_Board_PCB (void ) { -return (((Get_PLD_BOARD () >>4 ) &0x03 ) +'A' ); +return ((Get_PLD_BOARD () >>4 ) &0x03 ) +'A' ; }static u8 Get_SDRAM_ChipNr (void )
@@ -307,7 +304,7 @@ int checkboard(void) s[5 ] =0 ;Show_VCMA9_Info (s, &s[6 ]); } -return (0 ); +return 0 ; }int last_stage_init (void )
board/mpl/vcma9/vcma9.h +4 -2
@@ -27,7 +27,8 @@#include <asm/arch/s3c24x0_cpu.h> -extern int mem_test (unsigned long start,unsigned long ramsize,int mode); +int mem_test (unsigned long start,unsigned long ramsize,int mode); +int vcma9_cantest (int );void print_vcma9_info (void );#if defined(CONFIG_CMD_NAND )
@@ -81,7 +82,8 @@ static inline void NF_WaitRB(void) {struct s3c2410_nand *const nand =s3c2410_get_base_nand (); -while (!(nand->NFSTAT & (1 <<0 ))); +while (!(nand->NFSTAT & (1 <<0 ))) +/* Wait */ ; }static inline void NF_Write (u8 data)
board/samsung/smdk2400/smdk2400.c +3 -9
@@ -33,18 +33,13 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_MODEM_SUPPORT static int key_pressed (void ); -int mdm_init (bd_t *); -extern void disable_putc (void ); -extern void enable_putc (void ); -extern int hwflow_onoff (int ); -extern int do_mdm_init;/* defined in common/main.c */ #endif /* CONFIG_MODEM_SUPPORT */ /* * Miscellaneous platform dependent initialisations */ -int board_init (void ) +int board_init (void ) {struct s3c24x0_clock_power *const clk_power =s3c24x0_get_base_clock_power ();
@@ -93,7 +88,7 @@ int board_init (void)return 0 ; } -int dram_init (void ) +int dram_init (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ;
@@ -105,9 +100,8 @@ int dram_init (void)static int key_pressed (void ) {int rc; -if (1 ) {/* check for button push here, now just return 1 */ +if (1 )/* check for button push here, now just return 1 */ rc =1 ; - }return rc; }
board/sbc2410x/sbc2410x.c +3 -3
@@ -86,7 +86,7 @@ int board_init(void) clk_power->MPLLCON = ((M_MDIV <<12 ) + (M_PDIV <<4 ) +M_SDIV );/* some delay between MPLL and UPLL */ -delay (4000 ); +delay (4000 );/* configure UPLL */ clk_power->UPLLCON = ((U_M_MDIV <<12 ) + (U_M_PDIV <<4 ) +U_M_SDIV );
@@ -136,7 +136,6 @@ int dram_init(void) }#if defined(CONFIG_CMD_NAND ) -extern ulong nand_probe (ulong physadr);static inline void NF_Reset (void ) {
@@ -144,7 +143,8 @@ static inline void NF_Reset(void)NF_SetCE (NFCE_LOW );NF_Cmd (0xFF );/* reset command */ -for (i =0 ; i <10 ; i++);/* tWB = 100ns. */ +for (i =0 ; i <10 ; i++) +/* tWB = 100ns. */ ;NF_WaitRB ();/* wait 200~500us; */ NF_SetCE (NFCE_HIGH ); }
board/trab/auto_update.c +9 -21
@@ -27,6 +27,12 @@#include <image.h> #include <asm/byteorder.h> #include <usb.h> +#include <fat.h> +#include <i2c.h> +#include <flash.h> +#include <asm/arch/s3c24x0_cpu.h> +#include "tsc2000.h" +#include "trab.h" #ifdef CONFIG_SYS_HUSH_PARSER #include <hush.h>
@@ -187,24 +193,6 @@ struct flash_layout aufl_layout[AU_MAXFILES - 3] = { \/* the app is the largest image */ #define MAX_LOADSZ ausize[IDX_APP] -/* externals */ -extern int fat_register_device (block_dev_desc_t *,int ); -extern int file_fat_detectfs (void ); -extern long file_fat_read (const char *,void *,unsigned long ); -extern int i2c_read (unsigned char ,unsigned int ,int ,unsigned char * ,int ); -extern int i2c_write (uchar ,uint ,int ,uchar * ,int ); -#ifdef CONFIG_VFD -extern int trab_vfd (ulong ); -extern int transfer_pic (unsigned char ,unsigned char *,int ,int ); -#endif -extern int flash_sect_erase (ulong ,ulong ); -extern int flash_sect_protect (int ,ulong ,ulong ); -extern int flash_write (char *,ulong ,ulong ); -/* change char* to void* to shutup the compiler */ -extern int i2c_write_multiple (uchar ,uint ,int ,void *,int ); -extern int i2c_read_multiple (uchar ,uint ,int ,void *,int ); -extern int u_boot_hush_start (void ); -int au_check_cksum_valid (int idx,long nbytes) {
@@ -442,15 +430,15 @@ au_update_eeprom(int idx)/* write the time field into EEPROM */ off = auee_off[idx].time; val =image_get_time (hdr); -i2c_write_multiple (0x54 , off,1 , &val,sizeof (val)); +i2c_write_multiple (0x54 , off,1 , (uchar *)&val,sizeof (val));/* write the size field into EEPROM */ off = auee_off[idx].size; val =image_get_data_size (hdr); -i2c_write_multiple (0x54 , off,1 , &val,sizeof (val)); +i2c_write_multiple (0x54 , off,1 , (uchar *)&val,sizeof (val));/* write the dcrc field into EEPROM */ off = auee_off[idx].dcrc; val =image_get_dcrc (hdr); -i2c_write_multiple (0x54 , off,1 , &val,sizeof (val)); +i2c_write_multiple (0x54 , off,1 , (uchar *)&val,sizeof (val));/* enable the power switch */ *CPLD_VFD_BK &= ~POWER_OFF ;return 0 ;
board/trab/cmd_trab.c +93 -120
425 lines not on this page · raw message
board/trab/rs485.c +8 -8
@@ -62,7 +62,8 @@ static void rs485_setbrg(void) uart->UCON =0x245 ; uart->UBRDIV = reg; -for (i =0 ; i <100 ; i++); +for (i =0 ; i <100 ; i++) + ; }static void rs485_cfgio (void )
@@ -91,7 +92,7 @@ int rs485_init(void)rs485_cfgio ();rs485_setbrg (); -return (0 ); +return 0 ; }/*
@@ -103,8 +104,8 @@ int rs485_getc(void) {struct s3c24x0_uart *const uart =s3c24x0_get_base_uart (UART_NR ); -/* wait for character to arrive */ -while (!(uart->UTRSTAT &0x1 )); +while (!(uart->UTRSTAT &0x1 )) +/* wait for character to arrive */ ;return uart->URXH &0xff ; }
@@ -116,8 +117,8 @@ void rs485_putc(const char c) {struct s3c24x0_uart *const uart =s3c24x0_get_base_uart (UART_NR ); -/* wait for room in the tx FIFO */ -while (!(uart->UTRSTAT &0x2 )); +while (!(uart->UTRSTAT &0x2 )) +/* wait for room in the tx FIFO */ ; uart->UTXH = c;
@@ -138,9 +139,8 @@ int rs485_tstc(void)void rs485_puts (const char *s) { -while (*s) { +while (*s)rs485_putc (*s++); - } }/*
board/trab/trab.c +16 -27
130 lines not on this page · raw message
board/trab/trab.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Functions to access the TSC2000 controller on TRAB board (used for scanning +* thermo sensors) +* +* Copyright (C) 2009 Kevin Morfitt, kevin.morfitt at fearnside-systems.co.uk +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ + +#if defined(CONFIG_VFD ) +int vfd_init_clocks (void ); +#endif +#ifdef CONFIG_AUTO_UPDATE +int do_auto_update (void ); +#endif +#if defined(CONFIG_CMD_I2C ) +int i2c_write_multiple (uchar chip,uint addr,int alen, +uchar *buffer,int len); +int i2c_read_multiple (uchar chip,uint addr,int alen, +uchar *buffer,int len); +#endif +
board/trab/trab_fkt.c +140 -191
596 lines not on this page · raw message
board/trab/tsc2000.c +6 -6
@@ -65,9 +65,8 @@ void tsc2000_spi_init(void) spi->ch[0 ].SPCON =0x1A ;/* Dummy byte ensures clock to be low. */ -for (i =0 ; i <10 ; i++) { +for (i =0 ; i <10 ; i++) spi->ch[0 ].SPTDAT =0xFF ; - }spi_wait_transmit_done (); }
@@ -75,8 +74,8 @@ void spi_wait_transmit_done(void) {struct s3c24x0_spi *const spi =s3c24x0_get_base_spi (); -/* wait until transfer is done */ -while (!(spi->ch[0 ].SPSTA &0x01 )); +while (!(spi->ch[0 ].SPSTA &0x01 )) +/* wait until transfer is done */ ; }void tsc2000_write (unsigned short reg,unsigned short data)
@@ -317,7 +316,7 @@ s32 tsc2000_contact_temp(void)if (tsc2000_interpolate (u_pt1000, Pt1000_temp_table, &contact_temp) ==-1 ) {printf ("%s: error interpolating PT1000 vlaue\n" , __FUNCTION__); -return (-1000 ); +return -1000 ; }debug ("contact_temp: %ld\n" , contact_temp);
@@ -378,5 +377,6 @@ int tsc2000_interpolate(long value, long data[][2], long *result)void adc_wait_conversion_done (void ) { -while (!(tsc2000_read (TSC2000_REG_ADC ) & (1 <<14 ))); +while (!(tsc2000_read (TSC2000_REG_ADC ) & (1 <<14 ))) +/* Wait */ ; }
board/trab/tsc2000.h +1 -0
@@ -124,6 +124,7 @@ void spi_wait_transmit_done(void);void tsc2000_spi_init (void );int tsc2000_interpolate (long value,long data[][2 ],long *result);void adc_wait_conversion_done (void ); +int memory_post_tests (unsigned long start,unsigned long size);static inline void SET_CS_TOUCH (void ) {
board/trab/vfd.c +36 -34
170 lines not on this page · raw message
common/cmd_version.c +0 -2
@@ -24,8 +24,6 @@#include <common.h> #include <command.h> -extern char version_string[]; -int do_version (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {printf ("\n%s\n" , version_string);
common/cmd_vfd.c +0 -2
@@ -41,8 +41,6 @@#define VFD_TEST_LOGO_BMPNR 0#define VFD_REMOTE_LOGO_BMPNR 1 -extern int transfer_pic (unsigned char ,unsigned char *,int ,int ); -int trab_vfd (ulong bitmap);int do_vfd (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[])
common/main.c +2 -3
@@ -332,9 +332,8 @@ void main_loop (void)#ifdef CONFIG_VERSION_VARIABLE { -extern char version_string[]; - -setenv ("ver" , version_string);/* set version variable */ +/* set version variable */ +setenv ("ver" , (char *)version_string); }#endif /* CONFIG_VERSION_VARIABLE */
drivers/i2c/s3c24x0_i2c.c +32 -39
186 lines not on this page · raw message
drivers/video/cfb_console.c +0 -1
@@ -1197,7 +1197,6 @@ void logo_plot (void *screen, int width, int x, int y)static void *video_logo (void ) {char info[128 ]; -extern char version_string;int space, len, y_off =0 ;#ifdef CONFIG_SPLASH_SCREEN
include/common.h +14 -0
@@ -221,6 +221,12 @@ int display_options (void);void print_size (phys_size_t ,const char *);int print_buffer (ulong addr,void * data,uint width,uint count,uint linelen); +/* common/vfd.c */ +#if defined(CONFIG_CMD_VFD ) +int trab_vfd (ulong bitmap); +void transfer_pic (int ,unsigned char *,int ,int ); + +#endif /* common/main.c */ void main_loop (void );int run_command (const char *cmd,int flag);
@@ -229,6 +235,7 @@ int readline_into_buffer (const char *const prompt, char * buffer);int parse_line (char *,char *[]);void init_cmd_timeout (void );void reset_cmd_timeout (void ); +extern int do_mdm_init;/* lib_$(ARCH)/board.c */ void board_init_f (ulong ) __attribute__ ((noreturn));
@@ -239,6 +246,7 @@ int checkdram (void);int last_stage_init (void );extern ulong monitor_flash_len;int mac_read_from_eeprom (void ); +extern const char version_string[];/* common/flash.c */ void flash_perror (int );
@@ -485,6 +493,12 @@ void _serial_puts (const char *, const int);int _serial_getc (const int );int _serial_tstc (const int ); +#ifdef CONFIG_MODEM_SUPPORT +void disable_putc (void ); +void enable_putc (void ); +int hwflow_onoff (int ); +#endif +/* $(CPU)/speed.c */ int get_clocks (void );int get_clocks_866 (void );
lib_generic/display_options.c +0 -2
@@ -28,8 +28,6 @@int display_options (void ) { -extern char version_string[]; -#if defined(BUILD_TAG )printf ("\n\n%s, Build: %s\n\n" , version_string,BUILD_TAG );#else
Signature · 1 line
1.6.6
PATCH v2 2/3 s3c24x0 code style changes
Dear Kevin Morfitt,
Quoted 88 lines · Kevin Morfitt
Changes the s3c24x0 files to meet the code style requirements.
Signed-off-by Kevin Morfitt <[email protected]>---
v2 changes:
- re-number to be 2/3checkpatch.pl reports no errors.
?board/MAI/AmigaOneG3SE/video.c ? ?| ? ?1 - ?board/mpl/common/common_util.h ? ?| ? ?1 + ?board/mpl/common/flash.c ? ? ? ? ?| ? ?1 - ?board/mpl/vcma9/cmd_vcma9.c ? ? ? | ? ?9 - ?board/mpl/vcma9/vcma9.c ? ? ? ? ? | ? 27 ++-- ?board/mpl/vcma9/vcma9.h ? ? ? ? ? | ? ?6 +- ?board/samsung/smdk2400/smdk2400.c | ? 12 +- ?board/sbc2410x/sbc2410x.c ? ? ? ? | ? ?6 +- ?board/trab/auto_update.c ? ? ? ? ?| ? 30 +--- ?board/trab/cmd_trab.c ? ? ? ? ? ? | ?213 +++++++++++------------- ?board/trab/rs485.c ? ? ? ? ? ? ? ?| ? 16 +- ?board/trab/trab.c ? ? ? ? ? ? ? ? | ? 43 ++--- ?board/trab/trab.h ? ? ? ? ? ? ? ? | ? 38 +++++ ?board/trab/trab_fkt.c ? ? ? ? ? ? | ?331 ++++++++++++++++--------------------- ?board/trab/tsc2000.c ? ? ? ? ? ? ?| ? 12 +- ?board/trab/tsc2000.h ? ? ? ? ? ? ?| ? ?1 + ?board/trab/vfd.c ? ? ? ? ? ? ? ? ?| ? 70 ++++---- ?common/cmd_version.c ? ? ? ? ? ? ?| ? ?2 - ?common/cmd_vfd.c ? ? ? ? ? ? ? ? ?| ? ?2 - ?common/main.c ? ? ? ? ? ? ? ? ? ? | ? ?5 +- ?drivers/i2c/s3c24x0_i2c.c ? ? ? ? | ? 71 ++++----- ?drivers/video/cfb_console.c ? ? ? | ? ?1 - ?include/common.h ? ? ? ? ? ? ? ? ?| ? 14 ++ ?lib_generic/display_options.c ? ? | ? ?2 -?24 files changed, 418 insertions(+), 496 deletions(-) ?create mode 100644
board/trab/trab.hboard/MAI/AmigaOneG3SE/video.c +0
-0@@ -478,7 +478,6 @@ void video_easteregg(void)?#endif
?extern
block_dev_desc_t*ide_get_dev(int dev);
-extern char version_string[];?void
video_banner(void)
?{board/mpl/common/common_util.h +0
-0@@ -42,4 +42,5 @@ void check_env(void); ?void doc_init (void);?#endif
+int
do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); ?#endif /* _COMMON_UTIL_H_ */board/mpl/common/flash.c +0
-1@@ -159,7 +159,6 @@ unsigned long flash_init (void) ?#if !defined(CONFIG_PATI) ? ? ? ?unsigned long size_b1,flashcr,size_reg; ? ? ? ?int mode; - ? ? ? extern char version_string; ? ? ? ?char *p = &version_string;? ? ? ?/* Since we are relocated, we can set-up the CS finally */
board/mpl/vcma9/cmd_vcma9.c +0
-9@@ -43,15 +43,6 @@ static uchar cs8900_chksum(ushort data) ?DECLARE_GLOBAL_DATA_PTR; -extern void print_vcma9_info (void ); -extern int vcma9_cantest (int ); -extern int vcma9_nandtest (void ); -extern int vcma9_nanderase (void ); -extern int vcma9_nandread (ulong ); -extern int vcma9_nandwrite (ulong ); -extern int vcma9_dactest (int ); -extern int do_mplcommon (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]); -
Quoted 2 lines
?/* ------------------------------------------------------------------------- */
removing extern functions and values are ok.
but I wonder if it occur compile warnings.
Did you test it?
Quoted 66 lines
?int
do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])board/mpl/vcma9/vcma9.c +0
-0@@ -137,22 +137,19 @@ int board_init(void)?* NAND flash initialization.
?*/
?#ifdefined(CONFIG_CMD_NAND)board/mpl/vcma9/vcma9.c +0
-4-extern ulong -nand_probe (ulong physadr); - -?static inline void
NF_Reset(void)
?{
? ? ? ?int i;? ? ? ?NF_SetCE(NFCE_LOW);
- ? ? ?NF_Cmd(0xFF); ? ? ? ? ? ? ? ? ? /* reset command */
- ? ? ? for (i = 0; i < 10; i++); ? ? ? /* tWB = 100ns. */
- ? ? ?NF_WaitRB(); ? ? ? ? ? ? ? ? ? ?/* wait 200~500us; */
+ ? ? ?NF_Cmd(0xFF); ? ? ? ? ? /* reset command */
+ ? ? ? /* tWB = 100ns. */
+ ? ? ? for (i = 0; i < 10; i++)
+ ? ? ? ? ? ? ? /* delay */;
+ ? ? ?NF_WaitRB(); ? ? ? ? ? ?/* wait 200~500us; */ ? ? ? ?NF_SetCE(NFCE_HIGH);
?}-
?static inline voidNF_Init(void)
?{
?#define TACLS ?0board/mpl/vcma9/vcma9.c +4
-5@@ -187,36 +184,36 @@ static u8 Get_PLD_ID(void) ?{ ? ? ? ?VCMA9_PLD * const pld = VCMA9_get_base_PLD(); - ? ? ? return (pld->ID); + ? ? ? return pld->ID; ?} ?static u8 Get_PLD_BOARD(void) ?{ ? ? ? ?VCMA9_PLD * const pld = VCMA9_get_base_PLD(); - ? ? ? return (pld->BOARD); + ? ? ? return pld->BOARD; ?} ?static u8 Get_PLD_SDRAM(void) ?{ ? ? ? ?VCMA9_PLD * const pld = VCMA9_get_base_PLD(); - ? ? ? return (pld->SDRAM); + ? ? ? return pld->SDRAM; ?} ?static u8 Get_PLD_Version(void) ?{ - ? ? ? return ((Get_PLD_ID() >> 4) & 0x0F); + ? ? ? return (Get_PLD_ID() >> 4) & 0x0F; ?} ?static u8 Get_PLD_Revision(void) ?{ - ? ? ? return (Get_PLD_ID() & 0x0F);
board/mpl/vcma9/vcma9.c static u8 Get_PLD_ID(void) · line 219
Quoted 10 lines
board/mpl/vcma9/vcma9.c +2
-1+ ? ? ? return Get_PLD_ID() & 0x0F; ?} ?static uchar Get_Board_PCB(void) ?{ - ? ? ? return (((Get_PLD_BOARD() >> 4) & 0x03) + 'A'); + ? ? ? return ((Get_PLD_BOARD() >> 4) & 0x03) + 'A'; ?} ?static u8 Get_SDRAM_ChipNr(void)
Do you have plan for clean up such upper case function names?
Quoted 67 lines
board/mpl/vcma9/vcma9.c +1
-1@@ -307,7 +304,7 @@ int checkboard(void) ? ? ? ? ? ? ? ?s[5] = 0; ? ? ? ? ? ? ? ?Show_VCMA9_Info(s, &s[6]); ? ? ? ?} - ? ? ? return (0); + ? ? ? return 0; ?} ?int last_stage_init(void)board/mpl/vcma9/vcma9.h +0
-0@@ -27,7 +27,8 @@?#include <
asm/arch/s3c24x0_cpu.h>board/mpl/vcma9/vcma9.h +2
-1-extern int mem_test (unsigned long start,unsigned long ramsize,int mode); +int mem_test (unsigned long start,unsigned long ramsize,int mode); +int vcma9_cantest (int );?void
print_vcma9_info(void);?#if
defined(CONFIG_CMD_NAND)board/mpl/vcma9/vcma9.h +2
-1@@ -81,7 +82,8 @@ static inline void NF_WaitRB(void) ?{ ? ? ? ?struct s3c2410_nand * const nand = s3c2410_get_base_nand(); - ? ? ? while (!(nand->NFSTAT & (1 << 0))); + ? ? ? while (!(nand->NFSTAT & (1 << 0))) + ? ? ? ? ? ? ? /* Wait */; ?} ?static inline void NF_Write(u8 data)board/samsung/smdk2400/smdk2400.c +0
-0@@ -33,18 +33,13 @@ DECLARE_GLOBAL_DATA_PTR;?#ifdef
CONFIG_MODEM_SUPPORT
?static intkey_pressed(void);board/samsung/smdk2400/smdk2400.c +0
-5-int mdm_init (bd_t *); -extern void disable_putc (void ); -extern void enable_putc (void ); -extern int hwflow_onoff (int ); -extern int do_mdm_init;/* defined in common/main.c */ ?#endif /*
CONFIG_MODEM_SUPPORT*/?/*
?* Miscellaneous platform dependent initialisations ?*/board/samsung/smdk2400/smdk2400.c +1
-1-int board_init (void ) +int board_init (void )?{
? ? ? ?structs3c24x0_clock_power* constclk_power=
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?s3c24x0_get_base_clock_power();board/samsung/smdk2400/smdk2400.c +1
-1@@ -93,7 +88,7 @@ int board_init (void) ? ? ? ?return 0; ?} -int dram_init (void ) +int dram_init (void ) ?{ ? ? ? ?gd->bd->bi_dram[0].start = PHYS_SDRAM_1; ? ? ? ?gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
board/samsung/smdk2400/smdk2400.c int dram_init (void) · line 103
Quoted 5 lines
board/samsung/smdk2400/smdk2400.c +1
-1@@ -105,9 +100,8 @@ int dram_init (void) ?static int key_pressed(void) ?{ ? ? ? ?int rc; - ? ? ? if (1) { ? ? ? ?/* check for button push here, now just return 1 */ + ? ? ? if (1) ?/* check for button push here, now just return 1 */
Please remove this if (1).
Quoted 143 lines
board/samsung/smdk2400/smdk2400.c +0
-1? ? ? ? ? ? ? ?rc = 1; - ? ? ? } ? ? ? ?return rc; ?}board/sbc2410x/sbc2410x.c +0
-0@@ -86,7 +86,7 @@ int board_init(void) ? ? ? ?clk_power->MPLLCON = ((M_MDIV << 12) + (M_PDIV << 4) + M_SDIV);? ? ? ?/* some delay between MPLL and UPLL */
- ? ? ? delay (4000);
+ ? ? ? delay(4000);? ? ? ?/* configure UPLL */
? ? ? ?clk_power->UPLLCON = ((U_M_MDIV<< 12) + (U_M_PDIV<< 4) +U_M_SDIV);board/sbc2410x/sbc2410x.c +0
-1@@ -136,7 +136,6 @@ int dram_init(void) ?} ?#if defined(CONFIG_CMD_NAND) -extern ulong nand_probe (ulong physadr); ?static inline void NF_Reset(void) ?{@@ -144,7 +143,8 @@ static inline void NF_Reset(void) ? ? ? ?NF_SetCE(NFCE_LOW);? ? ? ?NF_Cmd(0xFF); ? ? ? ? ? ? ? ? ? /* reset command */
- ? ? ? for (i = 0; i < 10; i++); ? ? ? /* tWB = 100ns. */
+ ? ? ? for (i = 0; i < 10; i++)
+ ? ? ? ? ? ? ? /* tWB = 100ns. */;
? ? ? ?NF_WaitRB(); ? ? ? ? ? ? ? ? ? ?/* wait 200~500us; */ ? ? ? ?NF_SetCE(NFCE_HIGH);
?}board/trab/trab.c +0
-0@@ -28,6 +28,7 @@?#include <
malloc.h>
?#include <asm/arch/s3c24x0_cpu.h>
?#include <command.h>
+#include "trab.h"?DECLARE_GLOBAL_DATA_PTR;
board/trab/trab.c +0
-0@@ -40,8 +41,6 @@ static void tsc2000_set_brightness(void);?#endif
?#ifdefCONFIG_MODEM_SUPPORT
?static intkey_pressed(void);board/trab/trab.c +0
-2-extern void disable_putc (void ); -extern int do_mdm_init;/* defined in common/main.c */ ?/*
?* We need a delay of at least 500 us after turning on the VFD clockboard/trab/trab.c +0
-3@@ -67,9 +66,6 @@ static void udelay_no_timer(int usec) ?int board_init() ?{ -#if defined(CONFIG_VFD ) - ? ? ? extern int vfd_init_clocks(void); -#endif ? ? ? ?struct
s3c24x0_clock_power* constclk_power=
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?s3c24x0_get_base_clock_power(); ? ? ? ?structs3c24x0_gpio* const gpio =s3c24x0_get_base_gpio();board/trab/trab.c +0
-0@@ -93,12 +89,12 @@ int board_init() ? ? ? ?gpio->PBUP = 0xffff;? ? ? ?/* INPUT nCTS0 nRTS0 TXD[1] TXD[0] RXD[1] RXD[0] ? ? ? ?*/ ? ? ? ?/* ?00, ? ?10, ? ? ?10, ? ? ?10, ? ? ?10, ? ? ?10, ? ? ?10 ? ? ?*/
- ? ? ?gpio->PFCON= (2 << 0) | (2 << 2) | (2 << 4) | \
- ? ? ? ? ? ? ? ? ? ? ? (2 << 6) | (2 << 8) | (2 << 10);+ ? ? ? gpio->PFCON = (2 << 0) | (2 << 2) | (2 << 4) | + ? ? ? ? ? ? ? ? ? ? (2 << 6) | (2 << 8) | (2 << 10);?#ifdef
CONFIG_HWFLOW
? ? ? ?/* do not pull up RXD0, RXD1, TXD0, TXD1, CTS0, RTS0 */
- ? ? ?gpio->PFUP= (1 << 0) | (1 << 1) | (1 << 2) | \
- ? ? ? ? ? ? ? ? ? ? ? (1 << 3) | (1 << 4) | (1 << 5);+ ? ? ? gpio->PFUP = (1 << 0) | (1 << 1) | (1 << 2) | + ? ? ? ? ? ? ? ? ? ?(1 << 3) | (1 << 4) | (1 << 5);?#else
? ? ? ?/* do not pull up RXD0, RXD1, TXD0, TXD1 */
? ? ? ?gpio->PFUP = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);board/trab/trab.c +0
-0@@ -173,23 +169,19 @@ int misc_init_r(void)? ? ? ? ? ? ? ? * version variable has to be set this early, because so it ? ? ? ? ? ? ? ? * could be used in script files on an usb stick, which ? ? ? ? ? ? ? ? * might be called during
do_auto_update()*/
- ? ? ? ? ? ? ? extern char version_string[];
-
- ? ? ? ? ? ? ? setenv ("ver",version_string);
+ ? ? ? ? ? ? ?setenv("ver", (char *)version_string);
? ? ? ?}
?#endif /*CONFIG_VERSION_VARIABLE*/?#ifdef
CONFIG_AUTO_UPDATE
? ? ? ?{
- ? ? ? ? ? ? ? extern intdo_auto_update(void); ? ? ? ? ? ? ? ?/* this has priority over all else */ ? ? ? ? ? ? ? ?do_auto_update();
? ? ? ?}
?#endif- ? ? ? for (i = 0; i <
KEYBD_KEY_NUM; ++i) {
+ ? ? ? for (i = 0; i <KEYBD_KEY_NUM; ++i)
? ? ? ? ? ? ? ?keybd_env[i] = '0' + ((kbd_data>> i) & 1);
- ? ? ? }
? ? ? ?keybd_env[i] = '\0';
? ? ? ?debug("** Setting keybd=\"%s\"\n",keybd_env); ? ? ? ?setenv("keybd",keybd_env);board/trab/trab.c +0
-0@@ -201,14 +193,12 @@ int misc_init_r(void) ? ? ? ?debug("** Setting preboot=\"%s\"\n", str);? ? ? ?setenv("preboot", str); /* set or delete definition */ ?#endif /*
CONFIG_PREBOOT*/
- ? ? ? if (str != NULL) {
+ ? ? ? if (str != NULL)
? ? ? ? ? ? ? ?free(str);
- ? ? ? }
-
?#ifdefCONFIG_SYS_BRIGHTNESS
? ? ? ?tsc2000_set_brightness();
?#endif
- ? ? ? return (0);
+ ? ? ? return 0;
?}?#ifdef
CONFIG_PREBOOTboard/trab/trab.c +0
-0@@ -297,11 +287,11 @@ static char *key_match(ulong kbd_data) ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?cmd_name,? ? ? ? ? ? ? ? ? ? ? ? ? ? ?getenv(cmd_name) ?
? ? ? ? ? ? ? ? ? ? ? ? ? ? ?getenv(cmd_name) : "<UNDEFINED>");
- ? ? ? ? ? ? ? ? ? ? ? return (getenv(cmd_name));
+ ? ? ? ? ? ? ? ? ? ? ? returngetenv(cmd_name);
? ? ? ? ? ? ? ?}
? ? ? ?}
? ? ? ?debug("key_match: no match\n");
- ? ? ? return (NULL);
+ ? ? ? return NULL;
?}
?#endif /*CONFIG_PREBOOT*/board/trab/trab.c +0
-0@@ -328,7 +318,7 @@ U_BOOT_CMD(kbd, 1, 1, do_kbd, "read keyboard status", "");
Quoted 5 lines
?#ifdef
CONFIG_MODEM_SUPPORT
?static intkey_pressed(void)
?{
- ? ? ? return (compare_magic(KBD_DATA, CONFIG_MODEM_KEY_MAGIC)== 0);
+ ? ? ? returncompare_magic(KBD_DATA, CONFIG_MODEM_KEY_MAGIC)== 0;
return !compare_magic(KBD_DATA, CONFIG_MODEM_KEY_MAGIC); is better.
Quoted 32 lines
?}
?#endif /*CONFIG_MODEM_SUPPORT*/board/trab/trab.c +0
-0@@ -370,9 +360,8 @@ static void spi_init(void) ? ? ? ?spi->ch[0].SPCON = 0x1A;? ? ? ?/* Dummy byte ensures clock to be low. */
- ? ? ? for (i = 0; i < 10; i++) {
+ ? ? ? for (i = 0; i < 10; i++)
? ? ? ? ? ? ? ?spi->ch[0].SPTDAT =0xFF;
- ? ? ? }
? ? ? ?wait_transmit_done();
?}board/trab/trab.c +2
-2@@ -380,8 +369,8 @@ static void wait_transmit_done(void) ?{ ? ? ? ?struct s3c24x0_spi * const spi = s3c24x0_get_base_spi(); - ? ? ? /* wait until transfer is done */ - ? ? ? while (!(spi->ch[0].SPSTA & 0x01)); + ? ? ? while (!(spi->ch[0].SPSTA & 0x01)) + ? ? ? ? ? ? ? /* wait until transfer is done */; ?} ?static void tsc2000_write(unsigned int page, unsigned int reg,@@ -417,7 +406,7 @@ static void tsc2000_set_brightness(void) ? ? ? ?i = getenv_r("brightness", tmp, sizeof(tmp));? ? ? ?br = (i > 0) ? (int)simple_strtoul(tmp, NULL, 10) :
- ? ? ? ? ? ? ? ? ? ? ?CONFIG_SYS_BRIGHTNESS;
+ ? ? ? ? ? ?CONFIG_SYS_BRIGHTNESS;
Quoted 2 lines
? ? ? ?tsc2000_write(0,
0xb, br &0xff);
?}
Thanks
Minkyu Kang
Signature · 2 lines
from. prom. www.promsoft.net
PATCH v2 2/3 s3c24x0 code style changes
Hi Minkyu
Thanks for your comments...
Quoted 41 lines · Minkyu Kang
Dear Kevin Morfitt,
Quoted 37 lines · Kevin Morfitt
Changes the s3c24x0 files to meet the code style requirements.
Signed-off-by Kevin Morfitt<[email protected]>---
v2 changes:
- re-number to be 2/3checkpatch.pl reports no errors.
board/MAI/AmigaOneG3SE/video.c | 1 - board/mpl/common/common_util.h | 1 + board/mpl/common/flash.c | 1 - board/mpl/vcma9/cmd_vcma9.c | 9 - board/mpl/vcma9/vcma9.c | 27 ++-- board/mpl/vcma9/vcma9.h | 6 +- board/samsung/smdk2400/smdk2400.c | 12 +- board/sbc2410x/sbc2410x.c | 6 +- board/trab/auto_update.c | 30 +--- board/trab/cmd_trab.c | 213 +++++++++++------------- board/trab/rs485.c | 16 +- board/trab/trab.c | 43 ++--- board/trab/trab.h | 38 +++++ board/trab/trab_fkt.c | 331 ++++++++++++++++--------------------- board/trab/tsc2000.c | 12 +- board/trab/tsc2000.h | 1 + board/trab/vfd.c | 70 ++++---- common/cmd_version.c | 2 - common/cmd_vfd.c | 2 - common/main.c | 5 +- drivers/i2c/s3c24x0_i2c.c | 71 ++++----- drivers/video/cfb_console.c | 1 - include/common.h | 14 ++ lib_generic/display_options.c | 2 - 24 files changed, 418 insertions(+), 496 deletions(-)create mode 100644
board/trab/trab.h
<snip>
Quoted 16 lines
board/mpl/vcma9/cmd_vcma9.c static uchar cs8900_chksum(ushort data) · line 46
Quoted 12 lines
board/mpl/vcma9/cmd_vcma9.c +0
-9-extern void print_vcma9_info (void ); -extern int vcma9_cantest (int ); -extern int vcma9_nandtest (void ); -extern int vcma9_nanderase (void ); -extern int vcma9_nandread (ulong ); -extern int vcma9_nandwrite (ulong ); -extern int vcma9_dactest (int ); -extern int do_mplcommon (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]); -/* ------------------------------------------------------------------------- */ removing extern functions and values are ok.
but I wonder if it occur compile warnings.
Did you test it?
I added a new file, trab.h, with the function prototypes for the external functions. There were no new build warnings.
Quoted 30 lines
Quoted 30 lines
int
do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])board/mpl/vcma9/vcma9.c +5
-7@@ -137,22 +137,19 @@ int board_init(void)* NAND flash initialization. */ #if defined(CONFIG_CMD_NAND ) -extern ulong -nand_probe (ulong physadr); - -static inline void NF_Reset (void ) {int i;NF_SetCE (NFCE_LOW ); -NF_Cmd (0xFF );/* reset command */ -for (i =0 ; i<10 ; i++);/* tWB = 100ns. */ -NF_WaitRB ();/* wait 200~500us; */ +NF_Cmd (0xFF );/* reset command */ +/* tWB = 100ns. */ +for (i =0 ; i<10 ; i++) +/* delay */ ; +NF_WaitRB ();/* wait 200~500us; */ NF_SetCE (NFCE_HIGH ); }
<snip>
Quoted 12 lines
Quoted 12 lines
static u8 Get_PLD_Revision(void) {board/mpl/vcma9/vcma9.c +2
-2-return (Get_PLD_ID ()&0x0F ); +return Get_PLD_ID ()&0x0F ; }static uchar Get_Board_PCB (void ) { -return (((Get_PLD_BOARD ()>>4 )&0x03 ) +'A' ); +return ((Get_PLD_BOARD ()>>4 )&0x03 ) +'A' ; }
Quoted 3 lines
Quoted 1 line
static u8
Get_SDRAM_ChipNr(void)Do you have plan for clean up such upper case function names?
I didn't notice those, probably because checkpatch doesn't warn about them. I'll change it.
Quoted 62 lines
Quoted 62 lines
board/mpl/vcma9/vcma9.c +1
-1@@ -307,7 +304,7 @@ int checkboard(void) s[5 ] =0 ;Show_VCMA9_Info (s,&s[6 ]); } -return (0 ); +return 0 ; }int last_stage_init (void )board/mpl/vcma9/vcma9.h +4
-2@@ -27,7 +27,8 @@#include <asm/arch/s3c24x0_cpu.h> -extern int mem_test (unsigned long start,unsigned long ramsize,int mode); +int mem_test (unsigned long start,unsigned long ramsize,int mode); +int vcma9_cantest (int );void print_vcma9_info (void );#if defined(CONFIG_CMD_NAND )@@ -81,7 +82,8 @@ static inline void NF_WaitRB(void) {struct s3c2410_nand *const nand =s3c2410_get_base_nand (); -while (!(nand->NFSTAT& (1 <<0 ))); +while (!(nand->NFSTAT& (1 <<0 ))) +/* Wait */ ; }static inline void NF_Write (u8 data)board/samsung/smdk2400/smdk2400.c +1
-6@@ -33,18 +33,13 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_MODEM_SUPPORT static int key_pressed (void ); -int mdm_init (bd_t *); -extern void disable_putc (void ); -extern void enable_putc (void ); -extern int hwflow_onoff (int ); -extern int do_mdm_init;/* defined in common/main.c */ #endif /* CONFIG_MODEM_SUPPORT */ /* * Miscellaneous platform dependent initialisations */ -int board_init (void ) +int board_init (void ) {struct s3c24x0_clock_power *const clk_power =s3c24x0_get_base_clock_power ();@@ -93,7 +88,7 @@ int board_init (void)return 0 ; }
Quoted 13 lines
board/samsung/smdk2400/smdk2400.c int dram_init (void) · line 103
Quoted 11 lines
board/samsung/smdk2400/smdk2400.c +2
-2-int dram_init (void ) +int dram_init (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ;@@ -105,9 +100,8 @@ int dram_init (void)static int key_pressed (void ) {int rc; -if (1 ) {/* check for button push here, now just return 1 */ +if (1 )/* check for button push here, now just return 1 */ Please remove this if (1).
OK, I'll also clear up the upper case function names mentioned above.
Quoted 5 lines
Quoted 5 lines
board/samsung/smdk2400/smdk2400.c +0
-1rc =1 ; - }return rc;
<snip>
Quoted 16 lines
Quoted 16 lines
} #ifdef CONFIG_PREBOOTboard/samsung/smdk2400/smdk2400.c +2
-2@@ -297,11 +287,11 @@ static char *key_match(ulong kbd_data) cmd_name,getenv (cmd_name) ? getenv(cmd_name) : "<UNDEFINED>"); - return (getenv(cmd_name)); + return getenv(cmd_name); } }debug ("key_match: no match\n" ); -return (NULL ); +return NULL ; }#endif /* CONFIG_PREBOOT */
Quoted 8 lines
board/samsung/smdk2400/smdk2400.c U_BOOT_CMD(kbd, 1, 1, do_kbd, "read keyboard status", ""); · line 321
Quoted 6 lines
board/samsung/smdk2400/smdk2400.c +1
-1@@ -328,7 +318,7 @@ U_BOOT_CMD(kbd, 1, 1, do_kbd, "read keyboard status", "");#ifdef CONFIG_MODEM_SUPPORT static int key_pressed (void ) { -return (compare_magic (KBD_DATA ,CONFIG_MODEM_KEY_MAGIC ) ==0 ); +return compare_magic (KBD_DATA ,CONFIG_MODEM_KEY_MAGIC ) ==0 ;return !compare_magic(KBD_DATA,
CONFIG_MODEM_KEY_MAGIC); is better.
I changed it because checkpatch warned that 'return is not a function', but I think you're right, it's better as it was - I'll change it.
Quoted 38 lines
Quoted 27 lines
board/samsung/smdk2400/smdk2400.c +3
-4}#endif /* CONFIG_MODEM_SUPPORT */ @@ -370,9 +360,8 @@ static void spi_init(void) spi->ch[0 ].SPCON =0x1A ;/* Dummy byte ensures clock to be low. */ -for (i =0 ; i<10 ; i++) { +for (i =0 ; i<10 ; i++) spi->ch[0 ].SPTDAT =0xFF ; - }wait_transmit_done (); }@@ -380,8 +369,8 @@ static void wait_transmit_done(void) {struct s3c24x0_spi *const spi =s3c24x0_get_base_spi (); -/* wait until transfer is done */ -while (!(spi->ch[0 ].SPSTA&0x01 )); +while (!(spi->ch[0 ].SPSTA&0x01 )) +/* wait until transfer is done */ ; } static void tsc2000_write(unsigned int page, unsigned int reg,board/samsung/smdk2400/smdk2400.c static void tsc2000_set_brightness(void) · line 412
Quoted 8 lines
board/samsung/smdk2400/smdk2400.c +1
-1@@ -417,7 +406,7 @@ static void tsc2000_set_brightness(void) i =getenv_r ("brightness" , tmp,sizeof (tmp)); br = (i>0 ) ? (int )simple_strtoul (tmp,NULL ,10 ) : -CONFIG_SYS_BRIGHTNESS ; +CONFIG_SYS_BRIGHTNESS ;tsc2000_write (0 ,0xb , br&0xff ); }Thanks
Minkyu Kang