aboutsummaryrefslogtreecommitdiff
path: root/clients
diff options
context:
space:
mode:
authorThomas Huth <thuth@linux.vnet.ibm.com>2011-11-28 11:35:08 +0100
committerThomas Huth <thuth@linux.vnet.ibm.com>2011-12-20 17:56:34 +0100
commit33bb95bab24d2dca03ee9e641d0e98d9fbd86fdd (patch)
treeeca73c12131b0765e3dfb9fe33a4df2397e932bd /clients
parentec10f8af354266ba2576cfcc7d0c443a0cdbd7e9 (diff)
downloadSLOF-33bb95bab24d2dca03ee9e641d0e98d9fbd86fdd.zip
SLOF-33bb95bab24d2dca03ee9e641d0e98d9fbd86fdd.tar.gz
SLOF-33bb95bab24d2dca03ee9e641d0e98d9fbd86fdd.tar.bz2
Silenced some compiler warnings that occur when compiling with prototype checks
The compiler flags -Wmissing-prototypes and -Wstrict-prototypes generally help to write code with proper prototypes. This way one can avoid some ugly bugs because it helps to identify functions that do not have prototypes in headers. It also helps to improve performance since local functions then have to be declared "static", so the compiler can do better optimizations. Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Diffstat (limited to 'clients')
-rw-r--r--clients/net-snk/app/biosemu/device.c5
-rw-r--r--clients/net-snk/app/biosemu/io.c4
-rw-r--r--clients/net-snk/app/main.c1
-rw-r--r--clients/net-snk/app/netapps/args.c1
-rw-r--r--clients/net-snk/app/netapps/netboot.c1
-rw-r--r--clients/net-snk/app/netapps/netflash.c1
-rw-r--r--clients/net-snk/app/netapps/ping.c3
-rw-r--r--clients/net-snk/app/netlib/bootp.c7
-rw-r--r--clients/net-snk/include/kernel.h4
-rw-r--r--clients/net-snk/include/of.h9
-rw-r--r--clients/net-snk/include/pci.h3
-rw-r--r--clients/net-snk/include/rtas.h4
-rw-r--r--clients/net-snk/include/systemcall.h16
-rw-r--r--clients/net-snk/include/time.h6
-rw-r--r--clients/net-snk/kernel/crt0.c8
-rw-r--r--clients/net-snk/kernel/init.c16
-rw-r--r--clients/net-snk/kernel/modules.c9
-rw-r--r--clients/net-snk/kernel/modules.h17
-rw-r--r--clients/net-snk/kernel/systemcall.c12
-rw-r--r--clients/net-snk/kernel/timer.c3
-rw-r--r--clients/net-snk/libc/ioctl.c2
-rw-r--r--clients/net-snk/libc/sbrk.c2
-rw-r--r--clients/net-snk/libc/time/timer.c5
-rw-r--r--clients/net-snk/oflib/of.c33
-rw-r--r--clients/net-snk/oflib/pci.c1
-rw-r--r--clients/net-snk/oflib/rtas.c2
26 files changed, 106 insertions, 69 deletions
diff --git a/clients/net-snk/app/biosemu/device.c b/clients/net-snk/app/biosemu/device.c
index 71402d5..ba90072 100644
--- a/clients/net-snk/app/biosemu/device.c
+++ b/clients/net-snk/app/biosemu/device.c
@@ -15,6 +15,7 @@
#include "rtas.h"
#include <stdio.h>
#include <string.h>
+#include <of.h> // use translate_address_dev and get_puid from net-snk
#include "debug.h"
typedef struct {
@@ -26,10 +27,6 @@ typedef struct {
uint64_t size;
} __attribute__ ((__packed__)) assigned_address_t;
-// use translate_address_dev and get_puid from net-snk's net_support.c
-void translate_address_dev(uint64_t *, phandle_t);
-uint64_t get_puid(phandle_t node);
-
// scan all adresses assigned to the device ("assigned-addresses" and "reg")
// store in translate_address_array for faster translation using dev_translate_address
diff --git a/clients/net-snk/app/biosemu/io.c b/clients/net-snk/app/biosemu/io.c
index 0e46166..5cc1ad7 100644
--- a/clients/net-snk/app/biosemu/io.c
+++ b/clients/net-snk/app/biosemu/io.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <cpu.h>
+#include <pci.h>
#include "device.h"
#include "rtas.h"
#include "debug.h"
@@ -20,9 +21,6 @@
#include <x86emu/x86emu.h>
#include <time.h>
-// those are defined in net-snk/oflib/pci.c
-extern unsigned int read_io(void *, size_t);
-extern int write_io(void *, unsigned int, size_t);
//defined in net-snk/kernel/timer.c
extern uint64_t get_time(void);
diff --git a/clients/net-snk/app/main.c b/clients/net-snk/app/main.c
index fa9f49c..d92111a 100644
--- a/clients/net-snk/app/main.c
+++ b/clients/net-snk/app/main.c
@@ -22,6 +22,7 @@ extern int vbe_get_info(char argc, char**argv);
#endif
extern void _callback_entry(void);
+int callback(int argc, char *argv[]);
int
diff --git a/clients/net-snk/app/netapps/args.c b/clients/net-snk/app/netapps/args.c
index 90d6326..72cf0ea 100644
--- a/clients/net-snk/app/netapps/args.c
+++ b/clients/net-snk/app/netapps/args.c
@@ -14,6 +14,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
+#include "args.h"
/**
* Returns pointer of the n'th argument within a string.
diff --git a/clients/net-snk/app/netapps/netboot.c b/clients/net-snk/app/netapps/netboot.c
index 13202a7..aa4df11 100644
--- a/clients/net-snk/app/netapps/netboot.c
+++ b/clients/net-snk/app/netapps/netboot.c
@@ -24,6 +24,7 @@
#include <netapps/args.h>
#include <libbootmsg/libbootmsg.h>
#include <of.h>
+#include "netapps.h"
#define IP_INIT_DEFAULT 2
#define IP_INIT_NONE 0
diff --git a/clients/net-snk/app/netapps/netflash.c b/clients/net-snk/app/netapps/netflash.c
index 6865ecb..1c0c07c 100644
--- a/clients/net-snk/app/netapps/netflash.c
+++ b/clients/net-snk/app/netapps/netflash.c
@@ -19,6 +19,7 @@
#include <string.h>
#include <stdlib.h>
#include <sys/socket.h>
+#include "netapps.h"
int netflash(int argc, char * argv[])
{
diff --git a/clients/net-snk/app/netapps/ping.c b/clients/net-snk/app/netapps/ping.c
index 5557baf..b810484 100644
--- a/clients/net-snk/app/netapps/ping.c
+++ b/clients/net-snk/app/netapps/ping.c
@@ -19,6 +19,7 @@
#include <stdlib.h>
#include <time.h>
#include <netapps/args.h>
+#include "netapps.h"
struct ping_args {
union {
@@ -37,7 +38,7 @@ struct ping_args {
};
static void
-usage()
+usage(void)
{
printf
("\nping device-path:[device-args,]server-ip,[client-ip],[gateway-ip][,timeout]\n");
diff --git a/clients/net-snk/app/netlib/bootp.c b/clients/net-snk/app/netlib/bootp.c
index ca36a6d..7adf3f4 100644
--- a/clients/net-snk/app/netlib/bootp.c
+++ b/clients/net-snk/app/netlib/bootp.c
@@ -25,15 +25,16 @@
static char * response_buffer;
-void
+#if DEBUG
+static void
print_ip(char *ip)
{
printf("%d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]);
}
-
+#endif
/* IP header checksum calculation */
-unsigned short
+static unsigned short
checksum(unsigned short *packet, int words)
{
unsigned long checksum;
diff --git a/clients/net-snk/include/kernel.h b/clients/net-snk/include/kernel.h
index a7aff19..3fd4ea8 100644
--- a/clients/net-snk/include/kernel.h
+++ b/clients/net-snk/include/kernel.h
@@ -12,11 +12,15 @@
#ifndef KERNEL_H
#define KERNEL_H
+
#include <stddef.h>
+#include <stdint.h>
int printk(const char *, ...);
void *memcpy(void *, const void *, size_t);
void *memset(void *, int, size_t);
+
+uint64_t get_time(void);
void udelay(unsigned int);
void mdelay(unsigned int);
int getchar(void);
diff --git a/clients/net-snk/include/of.h b/clients/net-snk/include/of.h
index aced2d5..04d3ae8 100644
--- a/clients/net-snk/include/of.h
+++ b/clients/net-snk/include/of.h
@@ -10,9 +10,11 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-
#ifndef OF_H
#define OF_H
+
+#include <stdint.h>
+
#define p32 int
#define p32cast (int) (unsigned long) (void*)
@@ -53,4 +55,9 @@ int vpd_read(unsigned int , unsigned int , char *);
int vpd_write(unsigned int , unsigned int , char *);
int write_mm_log(char *, unsigned int , unsigned short );
+void get_mac(char *mac);
+uint64_t get_puid(phandle_t node);
+void translate_address_dev(uint64_t *, phandle_t);
+void translate_address(unsigned long *addr);
+
#endif
diff --git a/clients/net-snk/include/pci.h b/clients/net-snk/include/pci.h
index 285a6d0..b42619e 100644
--- a/clients/net-snk/include/pci.h
+++ b/clients/net-snk/include/pci.h
@@ -23,4 +23,7 @@ int pci_bus_scan_puid(long long puid, int class_to_check,
pci_config_t *pci_devices, int max_devs);
long long get_next_phb (phandle_t *phb);
+unsigned int read_io(void *addr, size_t sz);
+int write_io(void *addr, unsigned int value, size_t sz);
+
#endif
diff --git a/clients/net-snk/include/rtas.h b/clients/net-snk/include/rtas.h
index ff579f4..25cabf4 100644
--- a/clients/net-snk/include/rtas.h
+++ b/clients/net-snk/include/rtas.h
@@ -30,14 +30,14 @@ typedef void (*thread_t) (int);
int rtas_token(const char *);
int rtas_call(int, int, int, int *, ...);
-void rtas_init();
+void rtas_init(void);
int rtas_pci_config_read (long long, int, int, int, int);
int rtas_pci_config_write (long long, int, int, int, int, int);
int rtas_set_time_of_day(dtime *);
int rtas_get_time_of_day(dtime *);
int rtas_ibm_update_flash_64(long long, long long);
int rtas_ibm_update_flash_64_and_reboot(long long, long long);
-int rtas_system_reboot();
+int rtas_system_reboot(void);
int rtas_start_cpu (int, thread_t, int);
int rtas_stop_self (void);
int rtas_ibm_manage_flash(int);
diff --git a/clients/net-snk/include/systemcall.h b/clients/net-snk/include/systemcall.h
index 70aa92d..8bd3def 100644
--- a/clients/net-snk/include/systemcall.h
+++ b/clients/net-snk/include/systemcall.h
@@ -14,7 +14,7 @@
#ifndef SYSTEMCALL_H
#define SYSTEMCALL_H
-extern inline int
+static inline int
syscall (int nr)
{
register unsigned long r0 asm("r0") = nr;
@@ -24,7 +24,7 @@ syscall (int nr)
return r3;
}
-extern inline long
+static inline long
syscall_1 (int nr, long arg0)
{
register unsigned long r0 asm("r0") = nr;
@@ -34,7 +34,7 @@ syscall_1 (int nr, long arg0)
return r3;
}
-extern inline long
+static inline long
syscall_2 (int nr, long arg0, long arg1)
{
register unsigned long r0 asm("r0") = nr;
@@ -45,7 +45,7 @@ syscall_2 (int nr, long arg0, long arg1)
return r3;
}
-extern inline long
+static inline long
syscall_3 (int nr, long arg0, long arg1, long arg2)
{
register unsigned long r0 asm("r0") = nr;
@@ -57,7 +57,7 @@ syscall_3 (int nr, long arg0, long arg1, long arg2)
return r3;
}
-extern inline long
+static inline long
syscall_4 (int nr, long arg0, long arg1, long arg2, long arg3)
{
register unsigned long r0 asm("r0") = nr;
@@ -70,7 +70,7 @@ syscall_4 (int nr, long arg0, long arg1, long arg2, long arg3)
return r3;
}
-extern inline long
+static inline long
syscall_5 (int nr, long arg0, long arg1, long arg2, long arg3,
long arg4)
{
@@ -86,7 +86,7 @@ syscall_5 (int nr, long arg0, long arg1, long arg2, long arg3,
return r3;
}
-extern inline long
+static inline long
syscall_6 (int nr, long arg0, long arg1, long arg2, long arg3,
long arg4, long arg5)
{
@@ -103,7 +103,7 @@ syscall_6 (int nr, long arg0, long arg1, long arg2, long arg3,
return r3;
}
-extern inline long
+static inline long
syscall_7 (int nr, long arg0, long arg1, long arg2, long arg3,
long arg4, long arg5, long arg6)
{
diff --git a/clients/net-snk/include/time.h b/clients/net-snk/include/time.h
index 206f5a4..14d1c4c 100644
--- a/clients/net-snk/include/time.h
+++ b/clients/net-snk/include/time.h
@@ -24,11 +24,11 @@ extern unsigned long tb_freq;
/* setup the timer to start counting from the given parameter */
void set_timer(int);
/* read the current value from the decrementer */
-int get_timer();
+int get_timer(void);
/* get the number of ticks for which the decrementer needs 1 second */
-int get_sec_ticks();
+int get_sec_ticks(void);
/* get the number of ticks for which the decrementer needs 1 millisecond */
-int get_msec_ticks();
+int get_msec_ticks(void);
#define TICKS_MSEC get_msec_ticks()
#define TICKS_SEC get_sec_ticks()
diff --git a/clients/net-snk/kernel/crt0.c b/clients/net-snk/kernel/crt0.c
index 353bd95..a292273 100644
--- a/clients/net-snk/kernel/crt0.c
+++ b/clients/net-snk/kernel/crt0.c
@@ -10,14 +10,18 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-
#include <stdlib.h>
#include <string.h>
+
extern int main (int, char**);
extern int callback (int, char **);
+int _start(char *arg_string, long len);
+unsigned long callback_entry(void *base, unsigned long len);
+
+
#define MAX_ARGV 10
-int
+static int
gen_argv(const char *arg_string, int len, char* argv[])
{
const char *str, *str_end, *arg_string_end = arg_string + len;
diff --git a/clients/net-snk/kernel/init.c b/clients/net-snk/kernel/init.c
index e88b4eb..1c78adc 100644
--- a/clients/net-snk/kernel/init.c
+++ b/clients/net-snk/kernel/init.c
@@ -10,22 +10,22 @@
* IBM Corporation - initial implementation
*****************************************************************************/
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h> /* malloc */
#include <of.h>
#include <pci.h>
#include <kernel.h>
-#include <stdint.h>
-#include <string.h>
#include <cpu.h>
#include <fileio.h>
-#include <stdlib.h> /* malloc */
#include <ioctl.h> /* ioctl */
+#include "modules.h"
/* Application entry point .*/
extern int _start(unsigned char *arg_string, long len);
extern int main(int, char**);
+int _start_kernel(unsigned long p0, unsigned long p1);
void * malloc_aligned(size_t size, int align);
-extern snk_module_t *insmod_by_type(int);
-extern void rmmod_by_type(int);
unsigned long exception_stack_frame;
@@ -33,8 +33,6 @@ snk_fileio_t fd_array[FILEIO_MAX];
extern uint64_t tb_freq;
-void modules_init(void);
-void modules_term(void);
int glue_init(snk_kernel_t *, unsigned int *, size_t, size_t);
void glue_release(void);
@@ -74,7 +72,7 @@ malloc_aligned(size_t size, int align)
}
static void
-copy_exception_vectors()
+copy_exception_vectors(void)
{
char *dest;
char *src;
@@ -92,7 +90,7 @@ copy_exception_vectors()
}
static void
-restore_exception_vectors()
+restore_exception_vectors(void)
{
char *dest;
char *src;
diff --git a/clients/net-snk/kernel/modules.c b/clients/net-snk/kernel/modules.c
index b1d5efb..e06bb9f 100644
--- a/clients/net-snk/kernel/modules.c
+++ b/clients/net-snk/kernel/modules.c
@@ -18,12 +18,9 @@
#include <cpu.h> /* flush_cache */
#include <unistd.h> /* open, close, read, write */
#include <stdio.h>
+#include <pci.h>
+#include "modules.h"
-
-unsigned int read_io(void *, size_t);
-int write_io(void *, unsigned int, size_t);
-
-extern void get_mac(char *mac);
extern snk_module_t of_module;
extern char __client_start[];
@@ -146,7 +143,7 @@ modules_init(void)
}
void
-modules_term()
+modules_term(void)
{
int i;
diff --git a/clients/net-snk/kernel/modules.h b/clients/net-snk/kernel/modules.h
new file mode 100644
index 0000000..fde53af
--- /dev/null
+++ b/clients/net-snk/kernel/modules.h
@@ -0,0 +1,17 @@
+/******************************************************************************
+ * Copyright (c) 2011 IBM Corporation
+ * All rights reserved.
+ * This program and the accompanying materials
+ * are made available under the terms of the BSD License
+ * which accompanies this distribution, and is available at
+ * http://www.opensource.org/licenses/bsd-license.php
+ *
+ * Contributors:
+ * IBM Corporation - initial implementation
+ *****************************************************************************/
+
+extern void modules_init(void);
+extern void modules_term(void);
+extern snk_module_t *insmod_by_type(int);
+extern void rmmod_by_type(int);
+extern snk_module_t *get_module_by_type(int type);
diff --git a/clients/net-snk/kernel/systemcall.c b/clients/net-snk/kernel/systemcall.c
index 3c70e7d..b63df52 100644
--- a/clients/net-snk/kernel/systemcall.c
+++ b/clients/net-snk/kernel/systemcall.c
@@ -10,19 +10,21 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-
+#include <stdint.h>
+#include <stdarg.h>
+#include <string.h>
#include <of.h>
#include <systemcall.h>
-#include <stdarg.h>
#include <netdriver_int.h>
-#include <string.h>
#include <fileio.h>
+#include "modules.h"
-//extern ihandle_t fd_array[32];
-extern snk_module_t *get_module_by_type(int type);
extern int vsprintf(char *, const char *, va_list);
extern void _exit(int status);
+long _system_call(long arg0, long arg1, long arg2, long arg3,
+ long arg4, long arg5, long arg6, int nr);
+void exit(int status);
int printk(const char*, ...);
static int
diff --git a/clients/net-snk/kernel/timer.c b/clients/net-snk/kernel/timer.c
index 0b505a4..0b8a18f 100644
--- a/clients/net-snk/kernel/timer.c
+++ b/clients/net-snk/kernel/timer.c
@@ -11,6 +11,7 @@
*****************************************************************************/
#include <stdint.h>
+#include "kernel.h"
//*******************************************************************
// variable "tb_freq" contains the frequency in Hz
@@ -39,7 +40,7 @@ uint64_t get_time(void)
//-------------------------------------------------------------------
// wait for ticks/scale timebase ticks
-void wait_ticks(uint64_t ticks)
+static void wait_ticks(uint64_t ticks)
{
uint64_t timeout = get_time() + ticks;
while (get_time() < timeout) {
diff --git a/clients/net-snk/libc/ioctl.c b/clients/net-snk/libc/ioctl.c
index 370472c..fb64ea6 100644
--- a/clients/net-snk/libc/ioctl.c
+++ b/clients/net-snk/libc/ioctl.c
@@ -10,7 +10,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-
+#include <ioctl.h>
#include "systemcall.h"
diff --git a/clients/net-snk/libc/sbrk.c b/clients/net-snk/libc/sbrk.c
index 002e831..2ec1b5f 100644
--- a/clients/net-snk/libc/sbrk.c
+++ b/clients/net-snk/libc/sbrk.c
@@ -10,6 +10,8 @@
* IBM Corporation - initial implementation
*****************************************************************************/
+#include <unistd.h>
+
#define HEAP_SIZE 0x200000
diff --git a/clients/net-snk/libc/time/timer.c b/clients/net-snk/libc/time/timer.c
index 08477f1..b177372 100644
--- a/clients/net-snk/libc/time/timer.c
+++ b/clients/net-snk/libc/time/timer.c
@@ -10,7 +10,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-
+#include <kernel.h>
#include "time.h"
int get_msec_ticks()
@@ -34,6 +34,3 @@ int get_timer()
asm volatile ("mfdec %0":"=r" (val));
return val;
}
-
-
-
diff --git a/clients/net-snk/oflib/of.c b/clients/net-snk/oflib/of.c
index a4aea2d..1a836ca 100644
--- a/clients/net-snk/oflib/of.c
+++ b/clients/net-snk/oflib/of.c
@@ -10,13 +10,13 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-
+#include <stdint.h>
#include <of.h>
#include <rtas.h>
#include <string.h>
#include <netdriver_int.h>
#include <fileio.h>
-#include <stdint.h>
+#include <libbootmsg.h>
extern void call_client_interface(of_arg_t *);
@@ -27,6 +27,9 @@ static int ofmod_read(char *buffer, int len);
static int ofmod_write(char *buffer, int len);
static int ofmod_ioctl(int request, void *data);
+int glue_init(snk_kernel_t *, unsigned int *, size_t, size_t);
+void glue_release(void);
+
snk_module_t of_module = {
.version = 1,
.type = MOD_TYPE_OTHER,
@@ -45,7 +48,7 @@ static int claim_rc = 0;
static void* client_start;
static size_t client_size;
-extern inline int
+static inline int
of_0_1(const char *serv)
{
of_arg_t arg = {
@@ -59,7 +62,7 @@ of_0_1(const char *serv)
return arg.args[0];
}
-extern inline void
+static inline void
of_1_0(const char *serv, int arg0)
{
of_arg_t arg = {
@@ -71,7 +74,7 @@ of_1_0(const char *serv, int arg0)
call_client_interface(&arg);
}
-extern inline unsigned int
+static inline unsigned int
of_1_1(const char *serv, int arg0)
{
of_arg_t arg = {
@@ -84,7 +87,7 @@ of_1_1(const char *serv, int arg0)
return arg.args[1];
}
-extern inline unsigned int
+static inline unsigned int
of_1_2(const char *serv, int arg0, int *ret0)
{
of_arg_t arg = {
@@ -98,7 +101,7 @@ of_1_2(const char *serv, int arg0, int *ret0)
return arg.args[1];
}
-extern inline void
+static inline void
of_2_0(const char *serv, int arg0, int arg1)
{
of_arg_t arg = {
@@ -110,7 +113,7 @@ of_2_0(const char *serv, int arg0, int arg1)
call_client_interface(&arg);
}
-extern inline unsigned int
+static inline unsigned int
of_2_1(const char *serv, int arg0, int arg1)
{
of_arg_t arg = {
@@ -123,7 +126,7 @@ of_2_1(const char *serv, int arg0, int arg1)
return arg.args[2];
}
-extern inline unsigned int
+static inline unsigned int
of_2_2(const char *serv, int arg0, int arg1, int *ret0)
{
of_arg_t arg = {
@@ -137,7 +140,7 @@ of_2_2(const char *serv, int arg0, int arg1, int *ret0)
return arg.args[2];
}
-extern inline unsigned int
+static inline unsigned int
of_2_3(const char *serv, int arg0, int arg1, int *ret0, int *ret1)
{
of_arg_t arg = {
@@ -152,7 +155,7 @@ of_2_3(const char *serv, int arg0, int arg1, int *ret0, int *ret1)
return arg.args[2];
}
-extern inline void
+static inline void
of_3_0(const char *serv, int arg0, int arg1, int arg2)
{
of_arg_t arg = {
@@ -165,7 +168,7 @@ of_3_0(const char *serv, int arg0, int arg1, int arg2)
return;
}
-extern inline unsigned int
+static inline unsigned int
of_3_1(const char *serv, int arg0, int arg1, int arg2)
{
of_arg_t arg = {
@@ -178,7 +181,7 @@ of_3_1(const char *serv, int arg0, int arg1, int arg2)
return arg.args[3];
}
-extern inline unsigned int
+static inline unsigned int
of_3_2(const char *serv, int arg0, int arg1, int arg2, int *ret0)
{
of_arg_t arg = {
@@ -192,7 +195,7 @@ of_3_2(const char *serv, int arg0, int arg1, int arg2, int *ret0)
return arg.args[3];
}
-extern inline unsigned int
+static inline unsigned int
of_3_3(const char *serv, int arg0, int arg1, int arg2, int *ret0, int *ret1)
{
of_arg_t arg = {
@@ -207,7 +210,7 @@ of_3_3(const char *serv, int arg0, int arg1, int arg2, int *ret0, int *ret1)
return arg.args[3];
}
-extern inline unsigned int
+static inline unsigned int
of_4_1(const char *serv, int arg0, int arg1, int arg2, int arg3)
{
of_arg_t arg = {
diff --git a/clients/net-snk/oflib/pci.c b/clients/net-snk/oflib/pci.c
index 2a75829..40ff780 100644
--- a/clients/net-snk/oflib/pci.c
+++ b/clients/net-snk/oflib/pci.c
@@ -10,6 +10,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
+#include <stdint.h>
#include <rtas.h>
#include <of.h>
#include <pci.h>
diff --git a/clients/net-snk/oflib/rtas.c b/clients/net-snk/oflib/rtas.c
index df27a7d..8606823 100644
--- a/clients/net-snk/oflib/rtas.c
+++ b/clients/net-snk/oflib/rtas.c
@@ -10,11 +10,11 @@
* IBM Corporation - initial implementation
*****************************************************************************/
+#include <stdint.h>
#include <stdarg.h>
#include <stdio.h>
#include <rtas.h>
#include <of.h>
-#include <stdint.h>
#include <netdriver_int.h>
#include "kernel.h"