diff options
| -rw-r--r-- | arch/blackfin/lib/clock.c | 2 | ||||
| -rw-r--r-- | commands/bootm.c | 6 | ||||
| -rw-r--r-- | commands/clear.c | 2 | ||||
| -rw-r--r-- | commands/cp.c | 2 | ||||
| -rw-r--r-- | commands/crc.c | 2 | ||||
| -rw-r--r-- | commands/edit.c | 2 | ||||
| -rw-r--r-- | commands/environment.c | 4 | ||||
| -rw-r--r-- | commands/flash.c | 4 | ||||
| -rw-r--r-- | commands/go.c | 2 | ||||
| -rw-r--r-- | commands/mem.c | 6 | ||||
| -rw-r--r-- | commands/meminfo.c | 2 | ||||
| -rw-r--r-- | commands/memtest.c | 4 | ||||
| -rw-r--r-- | commands/net.c | 14 | ||||
| -rw-r--r-- | commands/partition.c | 4 | ||||
| -rw-r--r-- | commands/reginfo.c | 2 | ||||
| -rw-r--r-- | commands/sleep.c | 2 | ||||
| -rw-r--r-- | commands/splash.c | 2 | ||||
| -rw-r--r-- | commands/test.c | 3 | ||||
| -rw-r--r-- | common/command.c | 17 | ||||
| -rw-r--r-- | drivers/cfi_flash.c | 38 | ||||
| -rw-r--r-- | fs/cramfs/cramfs.c | 8 | ||||
| -rw-r--r-- | fs/devfs.c | 12 | ||||
| -rw-r--r-- | fs/ramfs.c | 34 | ||||
| -rw-r--r-- | include/cfi_flash.h | 14 | ||||
| -rw-r--r-- | lib/driver.c | 2 | ||||
| -rw-r--r-- | lib/readline.c | 8 |
26 files changed, 89 insertions, 109 deletions
diff --git a/arch/blackfin/lib/clock.c b/arch/blackfin/lib/clock.c index 71fccfeb4a..dc2ab5f555 100644 --- a/arch/blackfin/lib/clock.c +++ b/arch/blackfin/lib/clock.c @@ -48,7 +48,7 @@ ulong get_sclk(void) return get_vco() / ssel; } -uint64_t blackfin_clocksource_read(void) +static uint64_t blackfin_clocksource_read(void) { return ~(*pTCOUNT); } diff --git a/commands/bootm.c b/commands/bootm.c index 8f45d4c348..4a0d00daec 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -317,7 +317,7 @@ void unmap_image(struct image_handle *handle) #define OPT_OFTREE #endif -int do_bootm (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_bootm (cmd_tbl_t *cmdtp, int argc, char *argv[]) { ulong iflag; int verify = 1; @@ -666,7 +666,7 @@ do_bootm_artos (cmd_tbl_t *cmdtp, #endif #ifdef CONFIG_CMD_IMI -int do_iminfo ( cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_iminfo ( cmd_tbl_t *cmdtp, int argc, char *argv[]) { int arg; ulong addr; @@ -776,7 +776,7 @@ print_image_hdr (image_header_t *hdr) } #ifdef CONFIG_BZLIB -void bz_internal_error(int errcode) +static void bz_internal_error(int errcode) { printf ("BZIP2 internal error %d\n", errcode); } diff --git a/commands/clear.c b/commands/clear.c index 2ddd00d8aa..dac15c8658 100644 --- a/commands/clear.c +++ b/commands/clear.c @@ -24,7 +24,7 @@ #include <command.h> #include <readkey.h> -int do_clear (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_clear (cmd_tbl_t *cmdtp, int argc, char *argv[]) { printf(ANSI_CLEAR_SCREEN); diff --git a/commands/cp.c b/commands/cp.c index 032593df54..449cc10299 100644 --- a/commands/cp.c +++ b/commands/cp.c @@ -30,7 +30,7 @@ #define RW_BUF_SIZE (ulong)4096 -int do_cp ( cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_cp ( cmd_tbl_t *cmdtp, int argc, char *argv[]) { int r, w, ret = 1; int src = 0, dst = 0; diff --git a/commands/crc.c b/commands/crc.c index d36b5d363a..69633ce594 100644 --- a/commands/crc.c +++ b/commands/crc.c @@ -8,7 +8,7 @@ #include <malloc.h> #include <linux/ctype.h> -int do_crc (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_crc (cmd_tbl_t *cmdtp, int argc, char *argv[]) { ulong start = 0, size = ~0, total = 0, now; ulong crc = 0, vcrc = 0; diff --git a/commands/edit.c b/commands/edit.c index 5f04ff5ed0..9998d765c8 100644 --- a/commands/edit.c +++ b/commands/edit.c @@ -373,7 +373,7 @@ static void getwinsize(void) { } #endif -int do_edit(cmd_tbl_t * cmdtp, int argc, char *argv[]) +static int do_edit(cmd_tbl_t * cmdtp, int argc, char *argv[]) { int lastscrcol; int i; diff --git a/commands/environment.c b/commands/environment.c index d08cd9f63b..007ef4edfe 100644 --- a/commands/environment.c +++ b/commands/environment.c @@ -142,7 +142,7 @@ out1: } #ifdef __U_BOOT__ -int do_saveenv(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_saveenv(cmd_tbl_t *cmdtp, int argc, char *argv[]) { int ret, fd; char *filename, *dirname; @@ -317,7 +317,7 @@ out: } #ifdef __U_BOOT__ -int do_loadenv(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_loadenv(cmd_tbl_t *cmdtp, int argc, char *argv[]) { char *filename, *dirname; diff --git a/commands/flash.c b/commands/flash.c index 110d92a5c0..82cce0fdca 100644 --- a/commands/flash.c +++ b/commands/flash.c @@ -33,7 +33,7 @@ #include <fcntl.h> #include <linux/stat.h> -int do_flerase (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_flerase (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int fd; char *filename = NULL; @@ -90,7 +90,7 @@ U_BOOT_CMD_START(erase) U_BOOT_CMD_HELP(cmd_erase_help) U_BOOT_CMD_END -int do_protect (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_protect (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int fd; char *filename = NULL; diff --git a/commands/go.c b/commands/go.c index 36eca21187..f6d8fcd135 100644 --- a/commands/go.c +++ b/commands/go.c @@ -28,7 +28,7 @@ #include <common.h> #include <command.h> -int do_go (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_go (cmd_tbl_t *cmdtp, int argc, char *argv[]) { ulong addr, rc; int rcode = 0; diff --git a/commands/mem.c b/commands/mem.c index ffe2c3b818..0dbad839df 100644 --- a/commands/mem.c +++ b/commands/mem.c @@ -210,7 +210,7 @@ U_BOOT_CMD_START(md) U_BOOT_CMD_HELP(cmd_md_help) U_BOOT_CMD_END -int do_mem_mw ( cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_mem_mw ( cmd_tbl_t *cmdtp, int argc, char *argv[]) { int ret = 0; int fd; @@ -284,7 +284,7 @@ U_BOOT_CMD_START(mw) U_BOOT_CMD_HELP(cmd_mw_help) U_BOOT_CMD_END -int do_mem_cmp (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_mem_cmp (cmd_tbl_t *cmdtp, int argc, char *argv[]) { ulong addr1, addr2, count, ngood; int size; @@ -359,7 +359,7 @@ U_BOOT_CMD_START(memcmp) U_BOOT_CMD_HELP(cmd_memcmp_help) U_BOOT_CMD_END -int do_mem_cp (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_mem_cp (cmd_tbl_t *cmdtp, int argc, char *argv[]) { ulong count; ulong dest, src; diff --git a/commands/meminfo.c b/commands/meminfo.c index 634d661740..95f27e0f4f 100644 --- a/commands/meminfo.c +++ b/commands/meminfo.c @@ -23,7 +23,7 @@ #include <command.h> #include <malloc.h> -int do_meminfo (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_meminfo (cmd_tbl_t *cmdtp, int argc, char *argv[]) { malloc_stats(); diff --git a/commands/memtest.c b/commands/memtest.c index fd1ffa5bad..88d8aa356a 100644 --- a/commands/memtest.c +++ b/commands/memtest.c @@ -259,7 +259,7 @@ static int mem_test(ulong _start, ulong _end, ulong pattern_unused) } #else -int mem_test(ulong _start, ulong _end, ulong pattern) +static int mem_test(ulong _start, ulong _end, ulong pattern) { vu_long *addr; vu_long *start = (vu_long *)_start; @@ -317,7 +317,7 @@ int mem_test(ulong _start, ulong _end, ulong pattern) } #endif -int do_mem_mtest (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_mem_mtest (cmd_tbl_t *cmdtp, int argc, char *argv[]) { ulong start, end, pattern = 0; diff --git a/commands/net.c b/commands/net.c index 106ae8f064..2f1bf1360e 100644 --- a/commands/net.c +++ b/commands/net.c @@ -33,8 +33,6 @@ #include <fcntl.h> #include <errno.h> -extern int do_bootm (cmd_tbl_t *, int, int, char *[]); - static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]); static void netboot_update_env (void) @@ -88,7 +86,7 @@ static void netboot_update_env (void) #endif } -int do_bootp (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_bootp (cmd_tbl_t *cmdtp, int argc, char *argv[]) { return netboot_common (BOOTP, cmdtp, argc, argv); } @@ -100,7 +98,7 @@ U_BOOT_CMD_START(bootp) U_BOOT_CMD_HELP("[loadAddress] [bootfilename]\n") U_BOOT_CMD_END -int do_tftpb (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_tftpb (cmd_tbl_t *cmdtp, int argc, char *argv[]) { return netboot_common (TFTP, cmdtp, argc, argv); } @@ -116,7 +114,7 @@ U_BOOT_CMD_START(tftpboot) U_BOOT_CMD_HELP(cmd_tftpboot_help) U_BOOT_CMD_END -int do_rarpb (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_rarpb (cmd_tbl_t *cmdtp, int argc, char *argv[]) { return netboot_common (RARP, cmdtp, argc, argv); } @@ -129,7 +127,7 @@ U_BOOT_CMD_START(rarpboot) U_BOOT_CMD_END #ifdef CONFIG_NET_DHCP -int do_dhcp (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_dhcp (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int size; @@ -151,7 +149,7 @@ U_BOOT_CMD_END #endif /* CONFIG_NET_DHCP */ #ifdef CONFIG_NET_NFS -int do_nfs (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_nfs (cmd_tbl_t *cmdtp, int argc, char *argv[]) { return netboot_common(NFS, cmdtp, argc, argv); } @@ -221,7 +219,7 @@ static void cdp_update_env(void) } -int do_cdp (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_cdp (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int r; diff --git a/commands/partition.c b/commands/partition.c index 199f0c7c50..c6130337b7 100644 --- a/commands/partition.c +++ b/commands/partition.c @@ -105,7 +105,7 @@ static int mtd_part_do_parse_one(struct partition *part, const char *str, return 0; } -int do_addpart(cmd_tbl_t * cmdtp, int argc, char *argv[]) +static int do_addpart(cmd_tbl_t * cmdtp, int argc, char *argv[]) { struct partition *part; struct device_d *dev; @@ -181,7 +181,7 @@ U_BOOT_CMD_START(addpart) U_BOOT_CMD_HELP(cmd_addpart_help) U_BOOT_CMD_END -int do_delpart(cmd_tbl_t * cmdtp, int argc, char *argv[]) +static int do_delpart(cmd_tbl_t * cmdtp, int argc, char *argv[]) { struct device_d *dev; diff --git a/commands/reginfo.c b/commands/reginfo.c index 506ad92f2c..781a92c62c 100644 --- a/commands/reginfo.c +++ b/commands/reginfo.c @@ -23,7 +23,7 @@ #include <common.h> #include <command.h> -int do_reginfo (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_reginfo (cmd_tbl_t *cmdtp, int argc, char *argv[]) { reginfo(); return 0; diff --git a/commands/sleep.c b/commands/sleep.c index 52d146b76f..955eb718d6 100644 --- a/commands/sleep.c +++ b/commands/sleep.c @@ -24,7 +24,7 @@ #include <command.h> #include <clock.h> -int do_sleep (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_sleep (cmd_tbl_t *cmdtp, int argc, char *argv[]) { uint64_t start; ulong delay; diff --git a/commands/splash.c b/commands/splash.c index e3f04001b8..9fd4ded8c5 100644 --- a/commands/splash.c +++ b/commands/splash.c @@ -39,7 +39,7 @@ int splash_set_fb_data(struct fb_data *d) return 0; } -int do_splash(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_splash(cmd_tbl_t *cmdtp, int argc, char *argv[]) { ulong addr; bmp_image_t *bmp; diff --git a/commands/test.c b/commands/test.c index c9ede75bb1..fb986d47d2 100644 --- a/commands/test.c +++ b/commands/test.c @@ -76,8 +76,7 @@ static int parse_opt(const char *opt) return -1; } -int -do_test (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_test (cmd_tbl_t *cmdtp, int argc, char *argv[]) { char **ap; int left, adv, expr, last_expr, neg, last_cmp, opt, zero; diff --git a/common/command.c b/common/command.c index 8685b02778..f86bf50d75 100644 --- a/common/command.c +++ b/common/command.c @@ -31,8 +31,7 @@ #include <malloc.h> #include <environment.h> -int -do_version (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_version (cmd_tbl_t *cmdtp, int argc, char *argv[]) { extern char version_string[]; printf ("\n%s\n", version_string); @@ -45,8 +44,7 @@ U_BOOT_CMD_START(version) .usage = "print monitor version", U_BOOT_CMD_END -int -do_true (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_true (cmd_tbl_t *cmdtp, int argc, char *argv[]) { return 0; } @@ -57,8 +55,7 @@ U_BOOT_CMD_START(true) .usage = "do nothing, successfully", U_BOOT_CMD_END -int -do_false (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_false (cmd_tbl_t *cmdtp, int argc, char *argv[]) { return 1; } @@ -71,8 +68,7 @@ U_BOOT_CMD_END #ifdef CONFIG_SHELL_HUSH -int -do_readline (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_readline (cmd_tbl_t *cmdtp, int argc, char *argv[]) { char *buf = xzalloc(CONFIG_CBSIZE); @@ -103,8 +99,7 @@ U_BOOT_CMD_START(readline) U_BOOT_CMD_HELP(cmd_readline_help) U_BOOT_CMD_END -int -do_exit (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_exit (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int r; @@ -147,7 +142,7 @@ void u_boot_cmd_usage(cmd_tbl_t *cmdtp) * Use puts() instead of printf() to avoid printf buffer overflow * for long help messages */ -int do_help (cmd_tbl_t * cmdtp, int argc, char *argv[]) +static int do_help (cmd_tbl_t * cmdtp, int argc, char *argv[]) { if (argc == 1) { /*show list of commands */ int cmd_items = &__u_boot_cmd_end - diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c index 8f99c733e1..8a1e9f7224 100644 --- a/drivers/cfi_flash.c +++ b/drivers/cfi_flash.c @@ -181,15 +181,18 @@ static int flash_detect_cfi (flash_info_t * info); static int flash_write_cfiword (flash_info_t * info, ulong dest, cfiword_t cword); static int flash_full_status_check (flash_info_t * info, flash_sect_t sector, uint64_t tout, char *prompt); -ulong flash_get_size (flash_info_t *info, ulong base); +static ulong flash_get_size (flash_info_t *info, ulong base); #ifdef CONFIG_CFI_BUFFER_WRITE static int flash_write_cfibuffer (flash_info_t * info, ulong dest, const uchar * cp, int len); #endif +static int write_buff (flash_info_t *info, const uchar *src, ulong addr, ulong cnt); + +static int flash_real_protect(flash_info_t *info, long sector, int prot); /*----------------------------------------------------------------------- * create an address based on the offset and the port width */ -inline uchar *flash_make_addr (flash_info_t * info, flash_sect_t sect, uint offset) +static inline uchar *flash_make_addr (flash_info_t * info, flash_sect_t sect, uint offset) { return ((uchar *) (info->start[sect] + (offset * info->portwidth))); } @@ -198,7 +201,7 @@ inline uchar *flash_make_addr (flash_info_t * info, flash_sect_t sect, uint offs /*----------------------------------------------------------------------- * Debug support */ -void print_longlong (char *str, unsigned long long data) +static void print_longlong (char *str, unsigned long long data) { int i; char *cp; @@ -237,7 +240,7 @@ static void flash_printqry (flash_info_t * info, flash_sect_t sect) /*----------------------------------------------------------------------- * read a character at a port width address */ -inline uchar flash_read_uchar (flash_info_t * info, uint offset) +static inline uchar flash_read_uchar (flash_info_t * info, uint offset) { uchar *cp; @@ -252,7 +255,7 @@ inline uchar flash_read_uchar (flash_info_t * info, uint offset) /*----------------------------------------------------------------------- * read a short word by swapping for ppc format. */ -ushort flash_read_ushort (flash_info_t * info, flash_sect_t sect, uint offset) +static ushort flash_read_ushort (flash_info_t * info, flash_sect_t sect, uint offset) { uchar *addr; ushort retval; @@ -284,7 +287,7 @@ ushort flash_read_ushort (flash_info_t * info, flash_sect_t sect, uint offset) * read a long word by picking the least significant byte of each maximum * port size word. Swap for ppc format. */ -ulong flash_read_long (flash_info_t * info, flash_sect_t sect, uint offset) +static ulong flash_read_long (flash_info_t * info, flash_sect_t sect, uint offset) { uchar *addr; ulong retval; @@ -316,7 +319,7 @@ ulong flash_read_long (flash_info_t * info, flash_sect_t sect, uint offset) /*----------------------------------------------------------------------- */ -int cfi_probe (struct device_d *dev) +static int cfi_probe (struct device_d *dev) { unsigned long size = 0; flash_info_t *info = malloc(sizeof(flash_info_t)); @@ -356,7 +359,7 @@ static int flash_find_sector(flash_info_t * info, unsigned long adr) /*----------------------------------------------------------------------- */ -int flash_erase_one (flash_info_t * info, long sect) +static int flash_erase_one (flash_info_t * info, long sect) { int rcode = 0; @@ -389,7 +392,7 @@ int flash_erase_one (flash_info_t * info, long sect) return rcode; } -int cfi_erase(struct device_d *dev, size_t count, unsigned long offset) +static int cfi_erase(struct device_d *dev, size_t count, unsigned long offset) { flash_info_t *finfo = (flash_info_t *)dev->priv; unsigned long start, end; @@ -410,7 +413,7 @@ out: return ret; } -int cfi_protect(struct device_d *dev, size_t count, unsigned long offset, int prot) +static int cfi_protect(struct device_d *dev, size_t count, unsigned long offset, int prot) { flash_info_t *finfo = (flash_info_t *)dev->priv; unsigned long start, end; @@ -442,7 +445,7 @@ static ssize_t cfi_write(struct device_d* dev, const void* buf, size_t count, un return ret == 0 ? count : -1; } -void cfi_info (struct device_d* dev) +static void cfi_info (struct device_d* dev) { flash_info_t *info = (flash_info_t *)dev->priv; int i; @@ -556,7 +559,7 @@ device_initcall(cfi_init); * 1 - write timeout * 2 - Flash not erased */ -int write_buff (flash_info_t * info, const uchar * src, ulong addr, ulong cnt) +static int write_buff (flash_info_t * info, const uchar * src, ulong addr, ulong cnt) { ulong wp; ulong cp; @@ -649,7 +652,7 @@ int write_buff (flash_info_t * info, const uchar * src, ulong addr, ulong cnt) return flash_write_cfiword (info, wp, cword); } -int flash_real_protect (flash_info_t * info, long sector, int prot) +static int flash_real_protect (flash_info_t * info, long sector, int prot) { int retcode = 0; @@ -682,10 +685,11 @@ int flash_real_protect (flash_info_t * info, long sector, int prot) return retcode; } +#if 0 /*----------------------------------------------------------------------- * flash_read_user_serial - read the OneTimeProgramming cells */ -void flash_read_user_serial (flash_info_t * info, void *buffer, int offset, +static void flash_read_user_serial (flash_info_t * info, void *buffer, int offset, int len) { uchar *src; @@ -701,7 +705,7 @@ void flash_read_user_serial (flash_info_t * info, void *buffer, int offset, /* * flash_read_factory_serial - read the device Id from the protection area */ -void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset, +static void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset, int len) { uchar *src; @@ -711,7 +715,7 @@ void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset, memcpy (buffer, src + offset, len); flash_write_cmd (info, 0, 0, info->cmd_reset); } - +#endif /* @@ -1128,7 +1132,7 @@ static int flash_detect_cfi (flash_info_t * info) * The following code cannot be run from FLASH! * */ -ulong flash_get_size (flash_info_t *info, ulong base) +static ulong flash_get_size (flash_info_t *info, ulong base) { int i, j; flash_sect_t sect_cnt; diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c index 112f416f13..9c08ad5a29 100644 --- a/fs/cramfs/cramfs.c +++ b/fs/cramfs/cramfs.c @@ -201,7 +201,7 @@ struct cramfs_dir { DIR dir; }; -DIR* cramfs_opendir(struct device_d *_dev, const char *filename) +static DIR* cramfs_opendir(struct device_d *_dev, const char *filename) { char *f; struct cramfs_priv *priv = _dev->priv; @@ -406,7 +406,7 @@ static int cramfs_info (struct device_d *dev) } #endif -int cramfs_probe(struct device_d *dev) +static int cramfs_probe(struct device_d *dev) { struct fs_device_d *fsdev; struct cramfs_priv *priv; @@ -428,7 +428,7 @@ int cramfs_probe(struct device_d *dev) return 0; } -int cramfs_remove(struct device_d *dev) +static int cramfs_remove(struct device_d *dev) { struct cramfs_priv *priv = dev->priv; @@ -456,7 +456,7 @@ static struct fs_driver_d cramfs_driver = { } }; -int cramfs_init(void) +static int cramfs_init(void) { return register_driver(&cramfs_driver.drv); } diff --git a/fs/devfs.c b/fs/devfs.c index 4fc0dbb91b..cc8a9d0542 100644 --- a/fs/devfs.c +++ b/fs/devfs.c @@ -88,7 +88,7 @@ static int devfs_truncate(struct device_d *dev, FILE *f, ulong size) return 0; } -DIR* devfs_opendir(struct device_d *dev, const char *pathname) +static DIR* devfs_opendir(struct device_d *dev, const char *pathname) { DIR *dir; @@ -101,7 +101,7 @@ DIR* devfs_opendir(struct device_d *dev, const char *pathname) return dir; } -struct dirent* devfs_readdir(struct device_d *_dev, DIR *dir) +static struct dirent* devfs_readdir(struct device_d *_dev, DIR *dir) { struct device_d *dev = dir->priv; @@ -116,13 +116,13 @@ struct dirent* devfs_readdir(struct device_d *_dev, DIR *dir) return NULL; } -int devfs_closedir(struct device_d *dev, DIR *dir) +static int devfs_closedir(struct device_d *dev, DIR *dir) { free(dir); return 0; } -int devfs_stat(struct device_d *_dev, const char *filename, struct stat *s) +static int devfs_stat(struct device_d *_dev, const char *filename, struct stat *s) { struct device_d *dev; @@ -143,7 +143,7 @@ int devfs_stat(struct device_d *_dev, const char *filename, struct stat *s) return 0; } -int devfs_probe(struct device_d *dev) +static int devfs_probe(struct device_d *dev) { return 0; } @@ -171,7 +171,7 @@ static struct fs_driver_d devfs_driver = { } }; -int devfs_init(void) +static int devfs_init(void) { return register_driver(&devfs_driver.drv); } diff --git a/fs/ramfs.c b/fs/ramfs.c index 62093e4a35..815a5d8180 100644 --- a/fs/ramfs.c +++ b/fs/ramfs.c @@ -55,7 +55,7 @@ struct ramfs_priv { }; /* ---------------------------------------------------------------*/ -struct ramfs_inode * lookup(struct ramfs_inode *node, const char *name) +static struct ramfs_inode * lookup(struct ramfs_inode *node, const char *name) { // printf("lookup: %s in %p\n",name, node); if(node->mode != S_IFDIR) @@ -76,7 +76,7 @@ struct ramfs_inode * lookup(struct ramfs_inode *node, const char *name) return NULL; } -struct ramfs_inode* rlookup(struct ramfs_priv *priv, const char *path) +static struct ramfs_inode* rlookup(struct ramfs_priv *priv, const char *path) { struct ramfs_inode *node = &priv->root; static char *buf; @@ -100,7 +100,7 @@ out: return node; } -struct ramfs_inode* rlookup_parent(struct ramfs_priv *priv, const char *pathname, char **file) +static struct ramfs_inode* rlookup_parent(struct ramfs_priv *priv, const char *pathname, char **file) { char *path; struct ramfs_inode *node; @@ -131,7 +131,7 @@ out: static int chunks = 0; -struct ramfs_chunk *ramfs_get_chunk(void) +static struct ramfs_chunk *ramfs_get_chunk(void) { struct ramfs_chunk *data = malloc(sizeof(struct ramfs_chunk)); if (!data) @@ -148,7 +148,7 @@ struct ramfs_chunk *ramfs_get_chunk(void) return data; } -void ramfs_put_chunk(struct ramfs_chunk *data) +static void ramfs_put_chunk(struct ramfs_chunk *data) { // printf("put chunk\n"); free(data->data); @@ -177,7 +177,7 @@ static void ramfs_put_inode(struct ramfs_inode *node) free(node); } -struct ramfs_inode* node_insert(struct ramfs_inode *parent_node, const char *filename, ulong mode) +static struct ramfs_inode* node_insert(struct ramfs_inode *parent_node, const char *filename, ulong mode) { struct ramfs_inode *node, *new_node = ramfs_get_inode(); new_node->name = strdup(filename); @@ -209,7 +209,7 @@ struct ramfs_inode* node_insert(struct ramfs_inode *parent_node, const char *fil /* ---------------------------------------------------------------*/ -int ramfs_create(struct device_d *dev, const char *pathname, mode_t mode) +static int ramfs_create(struct device_d *dev, const char *pathname, mode_t mode) { struct ramfs_priv *priv = dev->priv; struct ramfs_inode *node; @@ -223,7 +223,7 @@ int ramfs_create(struct device_d *dev, const char *pathname, mode_t mode) return -ENOENT; } -int ramfs_unlink(struct device_d *dev, const char *pathname) +static int ramfs_unlink(struct device_d *dev, const char *pathname) { struct ramfs_priv *priv = dev->priv; struct ramfs_inode *node, *lastnode; @@ -248,12 +248,12 @@ int ramfs_unlink(struct device_d *dev, const char *pathname) return -ENOENT; } -int ramfs_mkdir(struct device_d *dev, const char *pathname) +static int ramfs_mkdir(struct device_d *dev, const char *pathname) { return ramfs_create(dev, pathname, S_IFDIR); } -int ramfs_rmdir(struct device_d *dev, const char *pathname) +static int ramfs_rmdir(struct device_d *dev, const char *pathname) { struct ramfs_priv *priv = dev->priv; struct ramfs_inode *node, *lastnode; @@ -404,7 +404,7 @@ static int ramfs_write(struct device_d *_dev, FILE *f, const void *buf, size_t i return insize; } -int ramfs_truncate(struct device_d *dev, FILE *f, ulong size) +static int ramfs_truncate(struct device_d *dev, FILE *f, ulong size) { struct ramfs_inode *node = (struct ramfs_inode *)f->inode; int oldchunks, newchunks; @@ -451,7 +451,7 @@ int ramfs_truncate(struct device_d *dev, FILE *f, ulong size) return 0; } -DIR* ramfs_opendir(struct device_d *dev, const char *pathname) +static DIR* ramfs_opendir(struct device_d *dev, const char *pathname) { DIR *dir; struct ramfs_priv *priv = dev->priv; @@ -473,7 +473,7 @@ DIR* ramfs_opendir(struct device_d *dev, const char *pathname) return dir; } -struct dirent* ramfs_readdir(struct device_d *dev, DIR *dir) +static struct dirent* ramfs_readdir(struct device_d *dev, DIR *dir) { struct ramfs_inode *node = dir->priv; @@ -485,13 +485,13 @@ struct dirent* ramfs_readdir(struct device_d *dev, DIR *dir) return NULL; } -int ramfs_closedir(struct device_d *dev, DIR *dir) +static int ramfs_closedir(struct device_d *dev, DIR *dir) { free(dir); return 0; } -int ramfs_stat(struct device_d *dev, const char *filename, struct stat *s) +static int ramfs_stat(struct device_d *dev, const char *filename, struct stat *s) { struct ramfs_priv *priv = dev->priv; struct ramfs_inode *node = rlookup(priv, filename); @@ -506,7 +506,7 @@ int ramfs_stat(struct device_d *dev, const char *filename, struct stat *s) return 0; } -int ramfs_probe(struct device_d *dev) +static int ramfs_probe(struct device_d *dev) { struct ramfs_inode *n; struct ramfs_priv *priv = xzalloc(sizeof(struct ramfs_priv)); @@ -559,7 +559,7 @@ static struct fs_driver_d ramfs_driver = { } }; -int ramfs_init(void) +static int ramfs_init(void) { return register_driver(&ramfs_driver.drv); } diff --git a/include/cfi_flash.h b/include/cfi_flash.h index 2e8e6d7634..22e3fca35c 100644 --- a/include/cfi_flash.h +++ b/include/cfi_flash.h @@ -81,20 +81,6 @@ typedef struct { /* convert between bit value and numeric value */ #define CFI_FLASH_SHIFT_WIDTH 3 -/* Prototypes */ - -void flash_print_info (flash_info_t *); -int flash_sect_erase (ulong addr_first, ulong addr_last); -int flash_sect_protect (int flag, ulong addr_first, ulong addr_last); - -void flash_protect (int flag, ulong from, ulong to, flash_info_t *info); -int flash_write (char *, ulong, ulong); -flash_info_t *addr2info (ulong); -int write_buff (flash_info_t *info, const uchar *src, ulong addr, ulong cnt); - -int flash_real_protect(flash_info_t *info, long sector, int prot); -void flash_read_user_serial(flash_info_t * info, void * buffer, int offset, int len); -void flash_read_factory_serial(flash_info_t * info, void * buffer, int offset, int len); /*----------------------------------------------------------------------- * return codes from flash_write(): diff --git a/lib/driver.c b/lib/driver.c index 4095699621..62d8cadb45 100644 --- a/lib/driver.c +++ b/lib/driver.c @@ -327,7 +327,7 @@ int dummy_probe(struct device_d *dev) return 0; } -int do_devinfo ( cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_devinfo ( cmd_tbl_t *cmdtp, int argc, char *argv[]) { struct device_d *dev = first_device; struct driver_d *drv = first_driver; diff --git a/lib/readline.c b/lib/readline.c index c7aa287c77..ce63bc29ce 100644 --- a/lib/readline.c +++ b/lib/readline.c @@ -3,8 +3,6 @@ #include <init.h> #include <xfuncs.h> -extern char console_buffer[CONFIG_CBSIZE]; /* console I/O buffer */ - /* * cmdline-editing related codes from vivi. * Author: Janghoon Lyu <nandy@mizi.com> @@ -31,10 +29,10 @@ extern char console_buffer[CONFIG_CBSIZE]; /* console I/O buffer */ static int hist_max = 0; static int hist_add_idx = 0; static int hist_cur = -1; -unsigned hist_num = 0; +static unsigned hist_num = 0; -char* hist_list[HIST_MAX]; -char hist_lines[HIST_MAX][HIST_SIZE]; +static char* hist_list[HIST_MAX]; +static char hist_lines[HIST_MAX][HIST_SIZE]; #define add_idx_minus_one() ((hist_add_idx == 0) ? hist_max : hist_add_idx-1) |