From 426c2c150d43f1c2661205c9a0956fcbeeaeacc4 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:31:11 +0200 Subject: [PATCH 01/26] disable AES_convert_key by #if 0'ing it out (suggested by mcb30) --- src/crypto/axtls/aes.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/crypto/axtls/aes.c b/src/crypto/axtls/aes.c index 9154a5153..298e41932 100644 --- a/src/crypto/axtls/aes.c +++ b/src/crypto/axtls/aes.c @@ -238,6 +238,9 @@ void AES_set_key(AES_CTX *ctx, const uint8_t *key, memcpy(ctx->iv, iv, 16); } +#if 0 +/** currently unused function **/ + /** * Change a key for decryption. */ @@ -256,6 +259,7 @@ void AES_convert_key(AES_CTX *ctx) *k++ =w; } } +#endif /** * Encrypt a byte sequence (with a block size 16) using the AES cipher. From 1ec846b0380d292dcf306066d7feb2ed0de2e4db Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:31:45 +0200 Subject: [PATCH 02/26] make netboot() static --- src/usr/autoboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c index 97b9a4067..4bc43d5a7 100644 --- a/src/usr/autoboot.c +++ b/src/usr/autoboot.c @@ -103,7 +103,7 @@ static int boot_root_path ( const char *root_path ) { * @v netdev Network device * @ret rc Return status code */ -int netboot ( struct net_device *netdev ) { +static int netboot ( struct net_device *netdev ) { char buf[256]; int rc; From 42910594f73d8e58ac2f9b85cedc26073504c1fa Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:33:53 +0200 Subject: [PATCH 03/26] disable AES_convert_key by #if 0'ing it out (suggested by mcb30) --- src/crypto/axtls/crypto.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/crypto/axtls/crypto.h b/src/crypto/axtls/crypto.h index f6277adcc..855282faa 100644 --- a/src/crypto/axtls/crypto.h +++ b/src/crypto/axtls/crypto.h @@ -54,7 +54,9 @@ void AES_set_key(AES_CTX *ctx, const uint8_t *key, void AES_cbc_encrypt(AES_CTX *ctx, const uint8_t *msg, uint8_t *out, int length); void AES_cbc_decrypt(AES_CTX *ks, const uint8_t *in, uint8_t *out, int length); +#if 0 /** currently unused function **/ void AES_convert_key(AES_CTX *ctx); +#endif /************************************************************************** * RC4 declarations From 97aade0d1f39638eab55e3502e3f20997fbed2bd Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:35:17 +0200 Subject: [PATCH 04/26] make imgfill_cmdline static --- src/hci/commands/image_cmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c index 2d35ebcb2..97d41bdfb 100644 --- a/src/hci/commands/image_cmd.c +++ b/src/hci/commands/image_cmd.c @@ -45,7 +45,8 @@ * @v nargs Argument count * @v args Argument list */ -void imgfill_cmdline ( struct image *image, unsigned int nargs, char **args ) { +static void imgfill_cmdline ( struct image *image, unsigned int nargs, + char **args ) { size_t used = 0; image->cmdline[0] = '\0'; From 29134e35dcfe2512e3733da6baf4fc03d1258a4b Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:36:16 +0200 Subject: [PATCH 05/26] make md5_steps static --- src/crypto/md5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crypto/md5.c b/src/crypto/md5.c index 09378e20f..1fed24fcd 100644 --- a/src/crypto/md5.c +++ b/src/crypto/md5.c @@ -54,7 +54,7 @@ static u32 __md5step f4(u32 b, u32 c, u32 d) return ( c ^ ( b | ~d ) ); } -struct md5_step md5_steps[4] = { +static struct md5_step md5_steps[4] = { { .f = f1, .coefficient = 1, From ed06bd8a89d109c4f884f2aa4c23452d60ff58d0 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:36:53 +0200 Subject: [PATCH 06/26] make isspace static --- src/core/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/misc.c b/src/core/misc.c index 4219a36c5..af83cb146 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -42,7 +42,7 @@ int inet_aton ( const char *cp, struct in_addr *inp ) { return 0; } -int isspace ( int c ) { +static int isspace ( int c ) { switch ( c ) { case ' ': case '\f': From fa11865de0c90599c3c3d30bdf2d1094b556a79b Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:37:29 +0200 Subject: [PATCH 07/26] make add_ndp_entry static --- src/net/ndp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/net/ndp.c b/src/net/ndp.c index 7c684e7c1..3b6984db8 100644 --- a/src/net/ndp.c +++ b/src/net/ndp.c @@ -65,8 +65,9 @@ ndp_find_entry ( struct in6_addr *in6 ) { * @v ll_addr Link-layer address * @v state State of the entry - one of the NDP_STATE_XXX values */ -void add_ndp_entry ( struct net_device *netdev, struct in6_addr *in6, - void *ll_addr, int state ) { +static void +add_ndp_entry ( struct net_device *netdev, struct in6_addr *in6, + void *ll_addr, int state ) { struct ndp_entry *ndp; ndp = &ndp_table[next_new_ndp_entry++ % NUM_NDP_ENTRIES]; From 9280f2649a0337b323a6b11063fb8ecb3e56fc70 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:38:45 +0200 Subject: [PATCH 08/26] make struct _softlabelkeys *slks static --- src/hci/mucurses/slk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hci/mucurses/slk.c b/src/hci/mucurses/slk.c index 4422e15a0..600658e75 100644 --- a/src/hci/mucurses/slk.c +++ b/src/hci/mucurses/slk.c @@ -50,7 +50,7 @@ struct _softlabelkeys { short saved_pair; }; -struct _softlabelkeys *slks; +static struct _softlabelkeys *slks; /* I either need to break the primitives here, or write a collection of From 77ffd636fad639197dc297b6b8913190deedb098 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:39:31 +0200 Subject: [PATCH 09/26] make RTL8169_READ_GMII_REG, RTL8169_WRITE_GMII_REG static --- src/drivers/net/r8169.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c index d9854e9c4..08d1c6f62 100644 --- a/src/drivers/net/r8169.c +++ b/src/drivers/net/r8169.c @@ -400,7 +400,7 @@ static void rtl8169_hw_PHY_config(struct nic *nic __unused); // 20-16 5-bit GMII/MII register address // 15-0 16-bit GMII/MII register data //================================================================= -void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value) +static void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value) { int i; @@ -418,7 +418,7 @@ void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value) } //================================================================= -int RTL8169_READ_GMII_REG(unsigned long ioaddr, int RegAddr) +static int RTL8169_READ_GMII_REG(unsigned long ioaddr, int RegAddr) { int i, value = -1; From 9e7b165017afe1ba82c29d9e914ae85f6f2798c6 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:39:58 +0200 Subject: [PATCH 10/26] make __udivmoddi4 static --- src/arch/i386/core/udivmod64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/i386/core/udivmod64.c b/src/arch/i386/core/udivmod64.c index faf6fd8c8..e5a626cc8 100644 --- a/src/arch/i386/core/udivmod64.c +++ b/src/arch/i386/core/udivmod64.c @@ -294,7 +294,7 @@ static void udivmod64 ( const struct uint64 *x, * @ret r Remainder * @ret q Quotient */ -UDItype __udivmoddi4 ( UDItype x, UDItype d, UDItype *r ) { +static UDItype __udivmoddi4 ( UDItype x, UDItype d, UDItype *r ) { UDItype q; UDItype *_x = &x; UDItype *_d = &d; From 0e0843a872f10a7fc093038700e80248ba7c0e76 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:45:04 +0200 Subject: [PATCH 11/26] make _wgetc static --- src/hci/mucurses/kb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c index f0c8dcb0a..9f5c6bb72 100644 --- a/src/hci/mucurses/kb.c +++ b/src/hci/mucurses/kb.c @@ -30,6 +30,7 @@ int has_key ( int kc __unused ) { return TRUE; } +static int _wgetc ( WINDOW *win ) { int timer, c; From ac1e0aa63edcc5af3178e1f49a7b104adc018e1a Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:46:21 +0200 Subject: [PATCH 12/26] remove has_key by #if 0'ing out --- src/hci/mucurses/kb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c index 9f5c6bb72..a68cf26a7 100644 --- a/src/hci/mucurses/kb.c +++ b/src/hci/mucurses/kb.c @@ -19,6 +19,7 @@ int m_delay; /* bool m_echo; bool m_cbreak; +#if 0 /** * Check KEY_ code supported status * @@ -28,7 +29,8 @@ bool m_cbreak; */ int has_key ( int kc __unused ) { return TRUE; -} +} +#endif static int _wgetc ( WINDOW *win ) { From 3cb133d27daf11e77fe48d44e1ce639711f903de Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:47:28 +0200 Subject: [PATCH 13/26] make bool m_echo static --- src/hci/mucurses/kb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c index a68cf26a7..8f46bf67b 100644 --- a/src/hci/mucurses/kb.c +++ b/src/hci/mucurses/kb.c @@ -16,7 +16,7 @@ int m_delay; /* 0 : non-blocking read > 0 : timed blocking read */ -bool m_echo; +static bool m_echo; bool m_cbreak; #if 0 From 909ad9e80a94e55972255e422c5bf49bdd437d93 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:50:12 +0200 Subject: [PATCH 14/26] make cards_found static and add missing initialization --- src/drivers/net/pcnet32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c index 0328cf2c3..63353e3fe 100644 --- a/src/drivers/net/pcnet32.c +++ b/src/drivers/net/pcnet32.c @@ -67,7 +67,7 @@ static struct nic_operations pcnet32_operations; /* End Etherboot Specific */ -int cards_found /* __initdata */ ; +static int cards_found = 0 /* __initdata */ ; #ifdef REMOVE /* FIXME: Remove these they are probably pointless */ From 5ec4e2ad5010923c7793f0be8ddce058f170874c Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:58:31 +0200 Subject: [PATCH 15/26] make eltorito_load static --- src/arch/i386/image/eltorito.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/i386/image/eltorito.c b/src/arch/i386/image/eltorito.c index 53e25ca56..9d573106d 100644 --- a/src/arch/i386/image/eltorito.c +++ b/src/arch/i386/image/eltorito.c @@ -298,7 +298,7 @@ static int eltorito_load_disk ( struct image *image, * @v image El Torito file * @ret rc Return status code */ -int eltorito_load ( struct image *image ) { +static int eltorito_load ( struct image *image ) { struct eltorito_boot_entry boot_entry; unsigned long bootcat_offset; int rc; From e6cfa7ced96d17acfe745e94066e7f9de7e2716c Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 21:59:09 +0200 Subject: [PATCH 16/26] make http_open static --- src/net/tcp/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/tcp/http.c b/src/net/tcp/http.c index 88958af5a..9c2436816 100644 --- a/src/net/tcp/http.c +++ b/src/net/tcp/http.c @@ -465,7 +465,7 @@ static struct xfer_interface_operations http_xfer_operations = { * @v uri Uniform Resource Identifier * @ret rc Return status code */ -int http_open ( struct xfer_interface *xfer, struct uri *uri ) { +static int http_open ( struct xfer_interface *xfer, struct uri *uri ) { struct http_request *http; struct sockaddr_tcpip server; int rc; From dc38303ff999594b89f8f3cf7e701536413728c3 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 22:00:51 +0200 Subject: [PATCH 17/26] make nbi_load static --- src/arch/i386/image/nbi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/i386/image/nbi.c b/src/arch/i386/image/nbi.c index 3a66e9cb0..42596f057 100644 --- a/src/arch/i386/image/nbi.c +++ b/src/arch/i386/image/nbi.c @@ -244,7 +244,7 @@ static int nbi_process_segments ( struct image *image, * @v image NBI image * @ret rc Return status code */ -int nbi_load ( struct image *image ) { +static int nbi_load ( struct image *image ) { struct imgheader imgheader; int rc; From 9a4790667ad5001589211d5082be2ad2fe3624dc Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 22:01:23 +0200 Subject: [PATCH 18/26] make multiboot_load static --- src/arch/i386/image/multiboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/i386/image/multiboot.c b/src/arch/i386/image/multiboot.c index ab0b55ace..546de365d 100644 --- a/src/arch/i386/image/multiboot.c +++ b/src/arch/i386/image/multiboot.c @@ -360,7 +360,7 @@ static int multiboot_load_elf ( struct image *image ) { * @v image Multiboot file * @ret rc Return status code */ -int multiboot_load ( struct image *image ) { +static int multiboot_load ( struct image *image ) { struct multiboot_header_info hdr; int rc; From 4cd21524effbaf5e84dd43debac7e17a1b882d1a Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 22:02:11 +0200 Subject: [PATCH 19/26] make struct bnx2 bnx2 static --- src/drivers/net/bnx2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/net/bnx2.c b/src/drivers/net/bnx2.c index 105e9c3f4..fdd6655bb 100644 --- a/src/drivers/net/bnx2.c +++ b/src/drivers/net/bnx2.c @@ -43,7 +43,7 @@ static struct bss { struct statistics_block stats_blk; } bnx2_bss; -struct bnx2 bnx2; +static struct bnx2 bnx2; static struct flash_spec flash_table[] = { From 5a0c70340373c1402f1d4ab6782fc4468ea88254 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 22:03:04 +0200 Subject: [PATCH 20/26] make struct nsx static --- src/drivers/net/ns83820.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c index 8b8500f48..3262ba6ce 100755 --- a/src/drivers/net/ns83820.c +++ b/src/drivers/net/ns83820.c @@ -364,7 +364,7 @@ struct ring_desc { #endif /* Private Storage for the NIC */ -struct ns83820_private { +static struct ns83820_private { u8 *base; int up; long idle; From 5c486ee75d9ba684fd534a502e9f6ed3166773d6 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 22:05:47 +0200 Subject: [PATCH 21/26] make struct velocity_info_tbl *info static --- src/drivers/net/via-velocity.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/net/via-velocity.h b/src/drivers/net/via-velocity.h index e0b8809f1..761cb3d44 100644 --- a/src/drivers/net/via-velocity.h +++ b/src/drivers/net/via-velocity.h @@ -1204,7 +1204,7 @@ struct velocity_info_tbl { u32 flags; }; -struct velocity_info_tbl *info; +static struct velocity_info_tbl *info; #define mac_hw_mibs_init(regs) {\ BYTE_REG_BITS_ON(MIBCR_MIBFRZ,&((regs)->MIBCR));\ From 63e489c14d15771bb3bc35c6e4609883994acd58 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Fri, 27 Jul 2007 22:07:01 +0200 Subject: [PATCH 22/26] make struct velocity_info vptx static --- src/drivers/net/via-velocity.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/net/via-velocity.h b/src/drivers/net/via-velocity.h index 761cb3d44..c296d2899 100644 --- a/src/drivers/net/via-velocity.h +++ b/src/drivers/net/via-velocity.h @@ -1768,7 +1768,7 @@ struct velocity_opt { #define TX_DESC_MAX 256 #define TX_DESC_DEF TX_DESC_MIN -struct velocity_info { +static struct velocity_info { // struct list_head list; struct pci_device *pdev; From 0ae6c53bd988269d46501854bb98274e497af8dd Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Sat, 28 Jul 2007 23:20:00 +0200 Subject: [PATCH 23/26] Revert "make __udivmoddi4 static" - gcc links to it implicitly This reverts commit 9e7b165017afe1ba82c29d9e914ae85f6f2798c6. --- src/arch/i386/core/udivmod64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/i386/core/udivmod64.c b/src/arch/i386/core/udivmod64.c index e5a626cc8..faf6fd8c8 100644 --- a/src/arch/i386/core/udivmod64.c +++ b/src/arch/i386/core/udivmod64.c @@ -294,7 +294,7 @@ static void udivmod64 ( const struct uint64 *x, * @ret r Remainder * @ret q Quotient */ -static UDItype __udivmoddi4 ( UDItype x, UDItype d, UDItype *r ) { +UDItype __udivmoddi4 ( UDItype x, UDItype d, UDItype *r ) { UDItype q; UDItype *_x = &x; UDItype *_d = &d; From 52e5c245652a3c71a43b00d2ea21e8aa6697a17c Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Sat, 28 Jul 2007 23:20:44 +0200 Subject: [PATCH 24/26] Revert "make isspace static" - prototype for isspace() is defined by C99, so can't be static This reverts commit ed06bd8a89d109c4f884f2aa4c23452d60ff58d0. --- src/core/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/misc.c b/src/core/misc.c index af83cb146..4219a36c5 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -42,7 +42,7 @@ int inet_aton ( const char *cp, struct in_addr *inp ) { return 0; } -static int isspace ( int c ) { +int isspace ( int c ) { switch ( c ) { case ' ': case '\f': From 3e816c3d569c28d1e6335063775d54d623e34e13 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 28 Jul 2007 22:52:20 +0100 Subject: [PATCH 25/26] Revert "make bool m_echo static" - I suspect this to be defined by spec This reverts commit 3cb133d27daf11e77fe48d44e1ce639711f903de. --- src/hci/mucurses/kb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c index 8f46bf67b..a68cf26a7 100644 --- a/src/hci/mucurses/kb.c +++ b/src/hci/mucurses/kb.c @@ -16,7 +16,7 @@ int m_delay; /* 0 : non-blocking read > 0 : timed blocking read */ -static bool m_echo; +bool m_echo; bool m_cbreak; #if 0 From 0d568ac2197428cbf17a4d83574fa2ff22fd7e72 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 28 Jul 2007 22:55:17 +0100 Subject: [PATCH 26/26] Make has_key() a static inline, rather than omitting it altogether. --- src/hci/mucurses/kb.c | 16 +--------------- src/include/curses.h | 4 ++++ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c index a68cf26a7..291ee6ac8 100644 --- a/src/hci/mucurses/kb.c +++ b/src/hci/mucurses/kb.c @@ -19,21 +19,7 @@ int m_delay; /* bool m_echo; bool m_cbreak; -#if 0 -/** - * Check KEY_ code supported status - * - * @v kc keycode value to check - * @ret TRUE KEY_* supported - * @ret FALSE KEY_* unsupported - */ -int has_key ( int kc __unused ) { - return TRUE; -} -#endif - -static -int _wgetc ( WINDOW *win ) { +static int _wgetc ( WINDOW *win ) { int timer, c; if ( win == NULL ) diff --git a/src/include/curses.h b/src/include/curses.h index 164dd2020..762a63b5a 100644 --- a/src/include/curses.h +++ b/src/include/curses.h @@ -566,6 +566,10 @@ static inline bool has_colors ( void ) { return TRUE; } +static inline int has_key ( int kc __unused ) { + return TRUE; +} + static inline int hline ( chtype ch, int n ) { return whline ( stdscr, ch, n ); }