[MIPS] CFE: Make code remotely resemble Linux code.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 57 insertions, 127 deletions

diff --git a/arch/mips/fw/cfe/cfe_api.c b/arch/mips/fw/cfe/cfe_api.c
index a9f69e4e40ac..717db74f7c6e 100644
--- a/arch/mips/fw/cfe/cfe_api.c
+++ b/arch/mips/fw/cfe/cfe_api.c
@@ -16,19 +16,16 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/*  *********************************************************************
-    *
-    *  Broadcom Common Firmware Environment (CFE)
-    *
-    *  Device Function stubs                    File: cfe_api.c
-    *
-    *  This module contains device function stubs (small routines to
-    *  call the standard "iocb" interface entry point to CFE).
-    *  There should be one routine here per iocb function call.
-    *
-    *  Authors:  Mitch Lichtenberg, Chris Demetriou
-    *
-    ********************************************************************* */
+/*
+ *
+ * Broadcom Common Firmware Environment (CFE)
+ *
+ * This module contains device function stubs (small routines to
+ * call the standard "iocb" interface entry point to CFE).
+ * There should be one routine here per iocb function call.
+ *
+ * Authors:  Mitch Lichtenberg, Chris Demetriou
+ */
 
 #include <asm/fw/cfe/cfe_api.h>
 #include "cfe_api_int.h"
@@ -37,12 +34,8 @@
 #define XPTR_FROM_NATIVE(n)     ((cfe_xptr_t) (intptr_t) (n))
 #define NATIVE_FROM_XPTR(x)     ((void *) (intptr_t) (x))
 
-#ifdef CFE_API_IMPL_NAMESPACE
-#define cfe_iocb_dispatch(a)            __cfe_iocb_dispatch(a)
-#endif
-int cfe_iocb_dispatch(cfe_xiocb_t * xiocb);
+int cfe_iocb_dispatch(struct cfe_xiocb *xiocb);
 
-#if defined(CFE_API_common) || defined(CFE_API_ALL)
 /*
  * Declare the dispatch function with args of "intptr_t".
  * This makes sure whatever model we're compiling in
@@ -53,27 +46,25 @@ int cfe_iocb_dispatch(cfe_xiocb_t * xiocb);
  */
 
 static int (*cfe_dispfunc) (intptr_t handle, intptr_t xiocb) = 0;
-static cfe_xuint_t cfe_handle = 0;
+static u64 cfe_handle = 0;
 
-int cfe_init(cfe_xuint_t handle, cfe_xuint_t ept)
+int cfe_init(u64 handle, u64 ept)
 {
         cfe_dispfunc = NATIVE_FROM_XPTR(ept);
         cfe_handle = handle;
         return 0;
 }
 
-int cfe_iocb_dispatch(cfe_xiocb_t * xiocb)
+int cfe_iocb_dispatch(struct cfe_xiocb * xiocb)
 {
         if (!cfe_dispfunc)
                 return -1;
         return (*cfe_dispfunc) ((intptr_t) cfe_handle, (intptr_t) xiocb);
 }
-#endif                          /* CFE_API_common || CFE_API_ALL */
 
-#if defined(CFE_API_close) || defined(CFE_API_ALL)
 int cfe_close(int handle)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_CLOSE;
         xiocb.xiocb_status = 0;
@@ -86,18 +77,16 @@ int cfe_close(int handle)
         return xiocb.xiocb_status;
 
 }
-#endif                          /* CFE_API_close || CFE_API_ALL */
 
-#if defined(CFE_API_cpu_start) || defined(CFE_API_ALL)
 int cfe_cpu_start(int cpu, void (*fn) (void), long sp, long gp, long a1)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_CPUCTL;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_cpuctl_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_cpuctl);
         xiocb.plist.xiocb_cpuctl.cpu_number = cpu;
         xiocb.plist.xiocb_cpuctl.cpu_command = CFE_CPU_CMD_START;
         xiocb.plist.xiocb_cpuctl.gp_val = gp;
@@ -109,18 +98,16 @@ int cfe_cpu_start(int cpu, void (*fn) (void), long sp, long gp, long a1)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_cpu_start || CFE_API_ALL */
 
-#if defined(CFE_API_cpu_stop) || defined(CFE_API_ALL)
 int cfe_cpu_stop(int cpu)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_CPUCTL;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_cpuctl_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_cpuctl);
         xiocb.plist.xiocb_cpuctl.cpu_number = cpu;
         xiocb.plist.xiocb_cpuctl.cpu_command = CFE_CPU_CMD_STOP;
 
@@ -128,18 +115,16 @@ int cfe_cpu_stop(int cpu)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_cpu_stop || CFE_API_ALL */
 
-#if defined(CFE_API_enumenv) || defined(CFE_API_ALL)
 int cfe_enumenv(int idx, char *name, int namelen, char *val, int vallen)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_ENV_SET;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_envbuf_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_envbuf);
         xiocb.plist.xiocb_envbuf.enum_idx = idx;
         xiocb.plist.xiocb_envbuf.name_ptr = XPTR_FROM_NATIVE(name);
         xiocb.plist.xiocb_envbuf.name_length = namelen;
@@ -150,20 +135,17 @@ int cfe_enumenv(int idx, char *name, int namelen, char *val, int vallen)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_enumenv || CFE_API_ALL */
 
-#if defined(CFE_API_enummem) || defined(CFE_API_ALL)
 int
-cfe_enummem(int idx, int flags, cfe_xuint_t * start, cfe_xuint_t * length,
-            cfe_xuint_t * type)
+cfe_enummem(int idx, int flags, u64 *start, u64 *length, u64 *type)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_MEMENUM;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = flags;
-        xiocb.xiocb_psize = sizeof(xiocb_meminfo_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_meminfo);
         xiocb.plist.xiocb_meminfo.mi_idx = idx;
 
         cfe_iocb_dispatch(&xiocb);
@@ -177,30 +159,26 @@ cfe_enummem(int idx, int flags, cfe_xuint_t * start, cfe_xuint_t * length,
 
         return 0;
 }
-#endif                          /* CFE_API_enummem || CFE_API_ALL */
 
-#if defined(CFE_API_exit) || defined(CFE_API_ALL)
 int cfe_exit(int warm, int status)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_RESTART;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = warm ? CFE_FLG_WARMSTART : 0;
-        xiocb.xiocb_psize = sizeof(xiocb_exitstat_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_exitstat);
         xiocb.plist.xiocb_exitstat.status = status;
 
         cfe_iocb_dispatch(&xiocb);
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_exit || CFE_API_ALL */
 
-#if defined(CFE_API_flushcache) || defined(CFE_API_ALL)
 int cfe_flushcache(int flg)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_FLUSHCACHE;
         xiocb.xiocb_status = 0;
@@ -212,34 +190,30 @@ int cfe_flushcache(int flg)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_flushcache || CFE_API_ALL */
 
-#if defined(CFE_API_getdevinfo) || defined(CFE_API_ALL)
 int cfe_getdevinfo(char *name)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_GETINFO;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = 0;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(name);
-        xiocb.plist.xiocb_buffer.buf_length = cfe_strlen(name);
+        xiocb.plist.xiocb_buffer.buf_length = strlen(name);
 
         cfe_iocb_dispatch(&xiocb);
 
         if (xiocb.xiocb_status < 0)
                 return xiocb.xiocb_status;
-        return xiocb.plist.xiocb_buffer.buf_devflags;
+        return xiocb.plist.xiocb_buffer.buf_ioctlcmd;
 }
-#endif                          /* CFE_API_getdevinfo || CFE_API_ALL */
 
-#if defined(CFE_API_getenv) || defined(CFE_API_ALL)
 int cfe_getenv(char *name, char *dest, int destlen)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         *dest = 0;
 
@@ -247,10 +221,10 @@ int cfe_getenv(char *name, char *dest, int destlen)
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_envbuf_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_envbuf);
         xiocb.plist.xiocb_envbuf.enum_idx = 0;
         xiocb.plist.xiocb_envbuf.name_ptr = XPTR_FROM_NATIVE(name);
-        xiocb.plist.xiocb_envbuf.name_length = cfe_strlen(name);
+        xiocb.plist.xiocb_envbuf.name_length = strlen(name);
         xiocb.plist.xiocb_envbuf.val_ptr = XPTR_FROM_NATIVE(dest);
         xiocb.plist.xiocb_envbuf.val_length = destlen;
 
@@ -258,18 +232,16 @@ int cfe_getenv(char *name, char *dest, int destlen)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_getenv || CFE_API_ALL */
 
-#if defined(CFE_API_getfwinfo) || defined(CFE_API_ALL)
 int cfe_getfwinfo(cfe_fwinfo_t * info)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_GETINFO;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_fwinfo_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_fwinfo);
 
         cfe_iocb_dispatch(&xiocb);
 
@@ -292,12 +264,10 @@ int cfe_getfwinfo(cfe_fwinfo_t * info)
 
         return 0;
 }
-#endif                          /* CFE_API_getfwinfo || CFE_API_ALL */
 
-#if defined(CFE_API_getstdhandle) || defined(CFE_API_ALL)
 int cfe_getstdhandle(int flg)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_GETHANDLE;
         xiocb.xiocb_status = 0;
@@ -311,23 +281,17 @@ int cfe_getstdhandle(int flg)
                 return xiocb.xiocb_status;
         return xiocb.xiocb_handle;
 }
-#endif                          /* CFE_API_getstdhandle || CFE_API_ALL */
 
-#if defined(CFE_API_getticks) || defined(CFE_API_ALL)
 int64_t
-#ifdef CFE_API_IMPL_NAMESPACE
-__cfe_getticks(void)
-#else
 cfe_getticks(void)
-#endif
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_GETTIME;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_time_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_time);
         xiocb.plist.xiocb_time.ticks = 0;
 
         cfe_iocb_dispatch(&xiocb);
@@ -335,18 +299,16 @@ cfe_getticks(void)
         return xiocb.plist.xiocb_time.ticks;
 
 }
-#endif                          /* CFE_API_getticks || CFE_API_ALL */
 
-#if defined(CFE_API_inpstat) || defined(CFE_API_ALL)
 int cfe_inpstat(int handle)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_INPSTAT;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = handle;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_inpstat_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_inpstat);
         xiocb.plist.xiocb_inpstat.inp_status = 0;
 
         cfe_iocb_dispatch(&xiocb);
@@ -355,20 +317,18 @@ int cfe_inpstat(int handle)
                 return xiocb.xiocb_status;
         return xiocb.plist.xiocb_inpstat.inp_status;
 }
-#endif                          /* CFE_API_inpstat || CFE_API_ALL */
 
-#if defined(CFE_API_ioctl) || defined(CFE_API_ALL)
 int
 cfe_ioctl(int handle, unsigned int ioctlnum, unsigned char *buffer,
-          int length, int *retlen, cfe_xuint_t offset)
+          int length, int *retlen, u64 offset)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_IOCTL;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = handle;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = offset;
         xiocb.plist.xiocb_buffer.buf_ioctlcmd = ioctlnum;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(buffer);
@@ -380,21 +340,19 @@ cfe_ioctl(int handle, unsigned int ioctlnum, unsigned char *buffer,
                 *retlen = xiocb.plist.xiocb_buffer.buf_retlen;
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_ioctl || CFE_API_ALL */
 
-#if defined(CFE_API_open) || defined(CFE_API_ALL)
 int cfe_open(char *name)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_OPEN;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = 0;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(name);
-        xiocb.plist.xiocb_buffer.buf_length = cfe_strlen(name);
+        xiocb.plist.xiocb_buffer.buf_length = strlen(name);
 
         cfe_iocb_dispatch(&xiocb);
 
@@ -402,27 +360,21 @@ int cfe_open(char *name)
                 return xiocb.xiocb_status;
         return xiocb.xiocb_handle;
 }
-#endif                          /* CFE_API_open || CFE_API_ALL */
 
-#if defined(CFE_API_read) || defined(CFE_API_ALL)
 int cfe_read(int handle, unsigned char *buffer, int length)
 {
         return cfe_readblk(handle, 0, buffer, length);
 }
-#endif                          /* CFE_API_read || CFE_API_ALL */
 
-#if defined(CFE_API_readblk) || defined(CFE_API_ALL)
-int
-cfe_readblk(int handle, cfe_xint_t offset, unsigned char *buffer,
-            int length)
+int cfe_readblk(int handle, s64 offset, unsigned char *buffer, int length)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_READ;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = handle;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = offset;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(buffer);
         xiocb.plist.xiocb_buffer.buf_length = length;
@@ -433,62 +385,41 @@ cfe_readblk(int handle, cfe_xint_t offset, unsigned char *buffer,
                 return xiocb.xiocb_status;
         return xiocb.plist.xiocb_buffer.buf_retlen;
 }
-#endif                          /* CFE_API_readblk || CFE_API_ALL */
 
-#if defined(CFE_API_setenv) || defined(CFE_API_ALL)
 int cfe_setenv(char *name, char *val)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_ENV_SET;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_envbuf_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_envbuf);
         xiocb.plist.xiocb_envbuf.enum_idx = 0;
         xiocb.plist.xiocb_envbuf.name_ptr = XPTR_FROM_NATIVE(name);
-        xiocb.plist.xiocb_envbuf.name_length = cfe_strlen(name);
+        xiocb.plist.xiocb_envbuf.name_length = strlen(name);
         xiocb.plist.xiocb_envbuf.val_ptr = XPTR_FROM_NATIVE(val);
-        xiocb.plist.xiocb_envbuf.val_length = cfe_strlen(val);
+        xiocb.plist.xiocb_envbuf.val_length = strlen(val);
 
         cfe_iocb_dispatch(&xiocb);
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_setenv || CFE_API_ALL */
-
-#if (defined(CFE_API_strlen) || defined(CFE_API_ALL)) \
-    && !defined(CFE_API_STRLEN_CUSTOM)
-int cfe_strlen(char *name)
-{
-        int count = 0;
-
-        while (*name++)
-                count++;
 
-        return count;
-}
-#endif                          /* CFE_API_strlen || CFE_API_ALL */
-
-#if defined(CFE_API_write) || defined(CFE_API_ALL)
 int cfe_write(int handle, unsigned char *buffer, int length)
 {
         return cfe_writeblk(handle, 0, buffer, length);
 }
-#endif                          /* CFE_API_write || CFE_API_ALL */
 
-#if defined(CFE_API_writeblk) || defined(CFE_API_ALL)
-int
-cfe_writeblk(int handle, cfe_xint_t offset, unsigned char *buffer,
-             int length)
+int cfe_writeblk(int handle, s64 offset, unsigned char *buffer, int length)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_WRITE;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = handle;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = offset;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(buffer);
         xiocb.plist.xiocb_buffer.buf_length = length;
@@ -499,4 +430,3 @@ cfe_writeblk(int handle, cfe_xint_t offset, unsigned char *buffer,
                 return xiocb.xiocb_status;
         return xiocb.plist.xiocb_buffer.buf_retlen;
 }
-#endif                          /* CFE_API_writeblk || CFE_API_ALL */