t-kernel team mailing list archive
-
t-kernel team
-
Mailing list archive
-
Message #00031
[PATCH] fix-warnings: fix most with gcc and armcc
From: Du Huanpeng <u74147@xxxxxxxxx>
fix warnings by default cflags, and linux kernel cflags,
the files below changed:
config/src/sysdepend/tef_em1d/rominfo_ram.c
driver/tef_em1d/kbpd/src/devevt.h
driver/tef_em1d/lowkbpd/src/hwkbpd.c
driver/tef_em1d/sysdsk/src/ata.c
driver/tef_em1d/sysdsk/src/atacmd.c
driver/tef_em1d/sysdsk/src/common.c
driver/tef_em1d/sysdsk/src/inthdr.c
include/device/lowkbpd.h
include/sys/consio.h
include/sys/sysdepend/rominfo_common.h
include/sys/sysdepend/segment_common.h
include/sys/sysdepend/str_align_common.h
include/sys/sysdepend/sysinfo_common.h
include/tk/sysdepend/dbgspt_common.h
include/tk/sysdepend/syscall_common.h
include/tk/sysdepend/sysdef_common.h
include/tk/sysdepend/syslib_common.h
kernel/sysdepend/cpu/em1d/cpu_calls.c
kernel/sysdepend/cpu/em1d/cpu_init.c
kernel/sysdepend/cpu/em1d/cpu_status.h
kernel/sysmgr/src/deviceio.c
kernel/tkernel/src/config.h
kernel/tkernel/src/subsystem.c
monitor/cmdsvc/src/armv6/break.c
monitor/cmdsvc/src/armv6/register.c
monitor/cmdsvc/src/command.c
monitor/cmdsvc/src/helpmsg.c
monitor/include/tmonitor.h
Signed-off-by: Du Huanpeng <u74147@xxxxxxxxx>
---
.../config/src/sysdepend/tef_em1d/rominfo_ram.c | 2 +-
tkernel_source/driver/tef_em1d/kbpd/src/devevt.h | 9 ---------
tkernel_source/driver/tef_em1d/lowkbpd/src/hwkbpd.c | 2 +-
tkernel_source/driver/tef_em1d/sysdsk/src/ata.c | 3 ++-
tkernel_source/driver/tef_em1d/sysdsk/src/atacmd.c | 4 +---
tkernel_source/driver/tef_em1d/sysdsk/src/common.c | 3 +--
tkernel_source/driver/tef_em1d/sysdsk/src/inthdr.c | 3 ---
tkernel_source/include/device/lowkbpd.h | 6 ++++++
tkernel_source/include/sys/consio.h | 2 +-
.../include/sys/sysdepend/rominfo_common.h | 20 ++++++++++----------
.../include/sys/sysdepend/segment_common.h | 20 ++++++++++----------
.../include/sys/sysdepend/str_align_common.h | 20 ++++++++++----------
.../include/sys/sysdepend/sysinfo_common.h | 20 ++++++++++----------
tkernel_source/include/tk/sysdepend/dbgspt_common.h | 20 ++++++++++----------
tkernel_source/include/tk/sysdepend/syscall_common.h | 20 ++++++++++----------
tkernel_source/include/tk/sysdepend/sysdef_common.h | 20 ++++++++++----------
tkernel_source/include/tk/sysdepend/syslib_common.h | 20 ++++++++++----------
tkernel_source/kernel/sysdepend/cpu/em1d/cpu_calls.c | 6 +++---
tkernel_source/kernel/sysdepend/cpu/em1d/cpu_init.c | 2 +-
.../kernel/sysdepend/cpu/em1d/cpu_status.h | 2 +-
tkernel_source/kernel/sysmgr/src/deviceio.c | 2 --
tkernel_source/kernel/tkernel/src/config.h | 2 ++
tkernel_source/kernel/tkernel/src/subsystem.c | 2 +-
tkernel_source/monitor/cmdsvc/src/armv6/break.c | 8 ++++----
tkernel_source/monitor/cmdsvc/src/armv6/register.c | 2 +-
tkernel_source/monitor/cmdsvc/src/command.c | 8 ++++----
tkernel_source/monitor/cmdsvc/src/helpmsg.c | 4 ++--
tkernel_source/monitor/include/tmonitor.h | 2 +-
28 files changed, 113 insertions(+), 121 deletions(-)
diff --git a/tkernel_source/config/src/sysdepend/tef_em1d/rominfo_ram.c b/tkernel_source/config/src/sysdepend/tef_em1d/rominfo_ram.c
index a181d29..4880d86 100644
--- a/tkernel_source/config/src/sysdepend/tef_em1d/rominfo_ram.c
+++ b/tkernel_source/config/src/sysdepend/tef_em1d/rominfo_ram.c
@@ -23,7 +23,7 @@
#include <sys/rominfo.h>
IMPORT UB SYSCONF[], DEVCONF[];
-IMPORT void START();
+IMPORT void START( void );
/* Kernel address */
#define RI_KERNEL_START (FP)&START /* Kernel start address */
diff --git a/tkernel_source/driver/tef_em1d/kbpd/src/devevt.h b/tkernel_source/driver/tef_em1d/kbpd/src/devevt.h
index 189e9b1..27dd86a 100644
--- a/tkernel_source/driver/tef_em1d/kbpd/src/devevt.h
+++ b/tkernel_source/driver/tef_em1d/kbpd/src/devevt.h
@@ -20,15 +20,6 @@
* definitions for data used for additional events used only inside manager
*/
-/*
- * data type for data used for additional events used only inside manager
- */
-typedef enum {
- PIC_TIMEOUT = -1, /* timeout */
- PIC_SPRESS = -2, /* shift press */
- PIC_KEYUP = -3 /* key up */
-} PseudoInputCmd;
-
typedef struct {
T_MSG head;
struct {
diff --git a/tkernel_source/driver/tef_em1d/lowkbpd/src/hwkbpd.c b/tkernel_source/driver/tef_em1d/lowkbpd/src/hwkbpd.c
index 097e3af..6dbc2f9 100644
--- a/tkernel_source/driver/tef_em1d/lowkbpd/src/hwkbpd.c
+++ b/tkernel_source/driver/tef_em1d/lowkbpd/src/hwkbpd.c
@@ -306,7 +306,7 @@ fin0:
/* start processing of TP processing task ID */
LOCAL ER tpstart(BOOL start)
{
- ER er;
+ ER er = E_OK;
W n, par[L_DEVCONF_VAL];
T_DINT dint;
T_CTSK ctsk;
diff --git a/tkernel_source/driver/tef_em1d/sysdsk/src/ata.c b/tkernel_source/driver/tef_em1d/sysdsk/src/ata.c
index a067728..ff970ae 100644
--- a/tkernel_source/driver/tef_em1d/sysdsk/src/ata.c
+++ b/tkernel_source/driver/tef_em1d/sysdsk/src/ata.c
@@ -254,7 +254,8 @@ EXPORT ER ataIdentify(DrvTab *drv, BOOL check)
if (uselba) {
/* When LBA is used, checking shall be required on
whether "Total Number of Sectors on LBA [60][61]" is correctly set or not */
- n = CnvLeW(*((UW*)&buf[60]));
+ MEMCPY(&n, buf+60, sizeof(UW));
+ n = CnvLeW(n);
if (tsec == n || tsec ==
(((n >> 16) & 0xFFFF)|((n & 0xFFFF) << 16))) {
; /* OK */
diff --git a/tkernel_source/driver/tef_em1d/sysdsk/src/atacmd.c b/tkernel_source/driver/tef_em1d/sysdsk/src/atacmd.c
index cf8c2c4..f1f6c39 100644
--- a/tkernel_source/driver/tef_em1d/sysdsk/src/atacmd.c
+++ b/tkernel_source/driver/tef_em1d/sysdsk/src/atacmd.c
@@ -101,14 +101,12 @@ LOCAL ER WaitInt(DrvTab *drv, W dcnt, W cmd)
*/
EXPORT void ataAbort(DrvTab *drv)
{
- ER er;
-
/* Main task may be in "READY" status.
Therefore, an abort flag shall be set up. */
drv->Aborted = TRUE;
/* Forcibly release the wait-for-main task (WaitInt) */
- er = tk_rel_wai(drv->WaitTskId);
+ tk_rel_wai(drv->WaitTskId);
}
/*
diff --git a/tkernel_source/driver/tef_em1d/sysdsk/src/common.c b/tkernel_source/driver/tef_em1d/sysdsk/src/common.c
index 13596cd..aceb112 100644
--- a/tkernel_source/driver/tef_em1d/sysdsk/src/common.c
+++ b/tkernel_source/driver/tef_em1d/sysdsk/src/common.c
@@ -29,7 +29,6 @@ EXPORT void sdSendEvt(DrvTab *drv, W kind)
{
W i;
DiskEvt evt;
- ER er;
evt.h.evttyp = (kind == TDE_EJECT && drv->OpenCnt != 0) ?
TDE_ILLEJECT : kind;
@@ -42,7 +41,7 @@ EXPORT void sdSendEvt(DrvTab *drv, W kind)
}
/* Send to the message buffer for event notification:ignore error */
- er = tk_snd_mbf(drv->MbfId, (void*)&evt, sizeof(evt), TMO_EVENT);
+ tk_snd_mbf(drv->MbfId, (void*)&evt, sizeof(evt), TMO_EVENT);
}
/*
diff --git a/tkernel_source/driver/tef_em1d/sysdsk/src/inthdr.c b/tkernel_source/driver/tef_em1d/sysdsk/src/inthdr.c
index 15feb5a..ff17f0a 100644
--- a/tkernel_source/driver/tef_em1d/sysdsk/src/inthdr.c
+++ b/tkernel_source/driver/tef_em1d/sysdsk/src/inthdr.c
@@ -27,9 +27,6 @@
EXPORT ER sdDefIntHdr(DrvTab *drv, BOOL regist)
{
ER er;
- T_DINT dint;
-
- dint.intatr = TA_HLNG;
if (drv->Spec.accif == MEM_ACCIF) return E_OK; /* Ignore */
diff --git a/tkernel_source/include/device/lowkbpd.h b/tkernel_source/include/device/lowkbpd.h
index 871fb88..0243ae3 100644
--- a/tkernel_source/include/device/lowkbpd.h
+++ b/tkernel_source/include/device/lowkbpd.h
@@ -35,7 +35,13 @@ typedef enum {
INP_KEY = 1, /* key data */
INP_FLG = 2, /* event flag registration */
INP_PD2 = 3, /* pd data 2 */
+
+ PIC_TIMEOUT = 4, /* timeout */
+ PIC_SPRESS = 5, /* shift press */
+ PIC_KEYUP = 6, /* key up */
+
SpecialReserve = -1 /* negative numbers are reserved for special purpose */
+
} InputCmd;
/* device error */
diff --git a/tkernel_source/include/sys/consio.h b/tkernel_source/include/sys/consio.h
index c28524f..6466603 100644
--- a/tkernel_source/include/sys/consio.h
+++ b/tkernel_source/include/sys/consio.h
@@ -45,7 +45,7 @@ IMPORT int cons_ioctl( int req, int arg );
/* Serial port (RS_PORT) only */
IMPORT int RS_putchar( int c );
-IMPORT int RS_getchar();
+IMPORT int RS_getchar( void );
IMPORT int RS_ioctl( int req, int arg );
/*
diff --git a/tkernel_source/include/sys/sysdepend/rominfo_common.h b/tkernel_source/include/sys/sysdepend/rominfo_common.h
index ffbe023..af731b2 100644
--- a/tkernel_source/include/sys/sysdepend/rominfo_common.h
+++ b/tkernel_source/include/sys/sysdepend/rominfo_common.h
@@ -21,34 +21,34 @@
#ifndef __SYS_ROMINFO_COMMON_H__
#define __SYS_ROMINFO_COMMON_H__
-#if STD_SH7727
+#ifdef STD_SH7727
# include <sys/sysdepend/std_sh7727/rominfo_depend.h>
#endif
-#if STD_SH7751R
+#ifdef STD_SH7751R
# include <sys/sysdepend/std_sh7751r/rominfo_depend.h>
#endif
-#if MIC_M32104
+#ifdef MIC_M32104
# include <sys/sysdepend/mic_m32104/rominfo_depend.h>
#endif
-#if STD_S1C38K
+#ifdef STD_S1C38K
# include <sys/sysdepend/std_s1c38k/rominfo_depend.h>
#endif
-#if STD_MC9328
+#ifdef STD_MC9328
# include <sys/sysdepend/std_mc9328/rominfo_depend.h>
#endif
-#if MIC_VR4131
+#ifdef MIC_VR4131
# include <sys/sysdepend/mic_vr4131/rominfo_depend.h>
#endif
-#if STD_VR5500
+#ifdef STD_VR5500
# include <sys/sysdepend/std_vr5500/rominfo_depend.h>
#endif
-#if STD_MB87Q1100
+#ifdef STD_MB87Q1100
# include <sys/sysdepend/std_mb87q1100/rominfo_depend.h>
#endif
-#if STD_SH7760
+#ifdef STD_SH7760
# include <sys/sysdepend/std_sh7760/rominfo_depend.h>
#endif
-#if TEF_EM1D
+#ifdef TEF_EM1D
# include <sys/sysdepend/tef_em1d/rominfo_depend.h>
#endif
diff --git a/tkernel_source/include/sys/sysdepend/segment_common.h b/tkernel_source/include/sys/sysdepend/segment_common.h
index 503df1a..5487c3c 100644
--- a/tkernel_source/include/sys/sysdepend/segment_common.h
+++ b/tkernel_source/include/sys/sysdepend/segment_common.h
@@ -26,34 +26,34 @@
/*
* System-dependent definition
*/
-#if STD_SH7727
+#ifdef STD_SH7727
# include <sys/sysdepend/std_sh7727/segment_depend.h>
#endif
-#if STD_SH7751R
+#ifdef STD_SH7751R
# include <sys/sysdepend/std_sh7751r/segment_depend.h>
#endif
-#if MIC_M32104
+#ifdef MIC_M32104
# include <sys/sysdepend/mic_m32104/segment_depend.h>
#endif
-#if STD_S1C38K
+#ifdef STD_S1C38K
# include <sys/sysdepend/std_s1c38k/segment_depend.h>
#endif
-#if STD_MC9328
+#ifdef STD_MC9328
# include <sys/sysdepend/std_mc9328/segment_depend.h>
#endif
-#if MIC_VR4131
+#ifdef MIC_VR4131
# include <sys/sysdepend/mic_vr4131/segment_depend.h>
#endif
-#if STD_VR5500
+#ifdef STD_VR5500
# include <sys/sysdepend/std_vr5500/segment_depend.h>
#endif
-#if STD_MB87Q1100
+#ifdef STD_MB87Q1100
# include <sys/sysdepend/std_mb87q1100/segment_depend.h>
#endif
-#if STD_SH7760
+#ifdef STD_SH7760
# include <sys/sysdepend/std_sh7760/segment_depend.h>
#endif
-#if TEF_EM1D
+#ifdef TEF_EM1D
# include <sys/sysdepend/tef_em1d/segment_depend.h>
#endif
diff --git a/tkernel_source/include/sys/sysdepend/str_align_common.h b/tkernel_source/include/sys/sysdepend/str_align_common.h
index 7f7d04e..c7a9bfb 100644
--- a/tkernel_source/include/sys/sysdepend/str_align_common.h
+++ b/tkernel_source/include/sys/sysdepend/str_align_common.h
@@ -21,34 +21,34 @@
#ifndef __SYS_STR_ALIGN_COMMON_H__
#define __SYS_STR_ALIGN_COMMON_H__
-#if STD_SH7727
+#ifdef STD_SH7727
# include <sys/sysdepend/std_sh7727/str_align_depend.h>
#endif
-#if STD_SH7751R
+#ifdef STD_SH7751R
# include <sys/sysdepend/std_sh7751r/str_align_depend.h>
#endif
-#if MIC_M32104
+#ifdef MIC_M32104
# include <sys/sysdepend/mic_m32104/str_align_depend.h>
#endif
-#if STD_S1C38K
+#ifdef STD_S1C38K
# include <sys/sysdepend/std_s1c38k/str_align_depend.h>
#endif
-#if STD_MC9328
+#ifdef STD_MC9328
# include <sys/sysdepend/std_mc9328/str_align_depend.h>
#endif
-#if MIC_VR4131
+#ifdef MIC_VR4131
# include <sys/sysdepend/mic_vr4131/str_align_depend.h>
#endif
-#if STD_VR5500
+#ifdef STD_VR5500
# include <sys/sysdepend/std_vr5500/str_align_depend.h>
#endif
-#if STD_MB87Q1100
+#ifdef STD_MB87Q1100
# include <sys/sysdepend/std_mb87q1100/str_align_depend.h>
#endif
-#if STD_SH7760
+#ifdef STD_SH7760
# include <sys/sysdepend/std_sh7760/str_align_depend.h>
#endif
-#if TEF_EM1D
+#ifdef TEF_EM1D
# include <sys/sysdepend/tef_em1d/str_align_depend.h>
#endif
diff --git a/tkernel_source/include/sys/sysdepend/sysinfo_common.h b/tkernel_source/include/sys/sysdepend/sysinfo_common.h
index edd2963..2c00459 100644
--- a/tkernel_source/include/sys/sysdepend/sysinfo_common.h
+++ b/tkernel_source/include/sys/sysdepend/sysinfo_common.h
@@ -21,34 +21,34 @@
#ifndef __SYS_SYSINFO_COMMON_H__
#define __SYS_SYSINFO_COMMON_H__
-#if STD_SH7727
+#ifdef STD_SH7727
# include <sys/sysdepend/std_sh7727/sysinfo_depend.h>
#endif
-#if STD_SH7751R
+#ifdef STD_SH7751R
# include <sys/sysdepend/std_sh7751r/sysinfo_depend.h>
#endif
-#if MIC_M32104
+#ifdef MIC_M32104
# include <sys/sysdepend/mic_m32104/sysinfo_depend.h>
#endif
-#if STD_S1C38K
+#ifdef STD_S1C38K
# include <sys/sysdepend/std_s1c38k/sysinfo_depend.h>
#endif
-#if STD_MC9328
+#ifdef STD_MC9328
# include <sys/sysdepend/std_mc9328/sysinfo_depend.h>
#endif
-#if MIC_VR4131
+#ifdef MIC_VR4131
# include <sys/sysdepend/mic_vr4131/sysinfo_depend.h>
#endif
-#if STD_VR5500
+#ifdef STD_VR5500
# include <sys/sysdepend/std_vr5500/sysinfo_depend.h>
#endif
-#if STD_MB87Q1100
+#ifdef STD_MB87Q1100
# include <sys/sysdepend/std_mb87q1100/sysinfo_depend.h>
#endif
-#if STD_SH7760
+#ifdef STD_SH7760
# include <sys/sysdepend/std_sh7760/sysinfo_depend.h>
#endif
-#if TEF_EM1D
+#ifdef TEF_EM1D
# include <sys/sysdepend/tef_em1d/sysinfo_depend.h>
#endif
diff --git a/tkernel_source/include/tk/sysdepend/dbgspt_common.h b/tkernel_source/include/tk/sysdepend/dbgspt_common.h
index d3b8cb8..1ede436 100644
--- a/tkernel_source/include/tk/sysdepend/dbgspt_common.h
+++ b/tkernel_source/include/tk/sysdepend/dbgspt_common.h
@@ -24,34 +24,34 @@
/*
* System-dependent definition
*/
-#if STD_SH7727
+#ifdef STD_SH7727
# include <tk/sysdepend/std_sh7727/dbgspt_depend.h>
#endif
-#if STD_SH7751R
+#ifdef STD_SH7751R
# include <tk/sysdepend/std_sh7751r/dbgspt_depend.h>
#endif
-#if MIC_M32104
+#ifdef MIC_M32104
# include <tk/sysdepend/mic_m32104/dbgspt_depend.h>
#endif
-#if STD_S1C38K
+#ifdef STD_S1C38K
# include <tk/sysdepend/std_s1c38k/dbgspt_depend.h>
#endif
-#if STD_MC9328
+#ifdef STD_MC9328
# include <tk/sysdepend/std_mc9328/dbgspt_depend.h>
#endif
-#if MIC_VR4131
+#ifdef MIC_VR4131
# include <tk/sysdepend/mic_vr4131/dbgspt_depend.h>
#endif
-#if STD_VR5500
+#ifdef STD_VR5500
# include <tk/sysdepend/std_vr5500/dbgspt_depend.h>
#endif
-#if STD_MB87Q1100
+#ifdef STD_MB87Q1100
# include <tk/sysdepend/std_mb87q1100/dbgspt_depend.h>
#endif
-#if STD_SH7760
+#ifdef STD_SH7760
# include <tk/sysdepend/std_sh7760/dbgspt_depend.h>
#endif
-#if TEF_EM1D
+#ifdef TEF_EM1D
# include <tk/sysdepend/tef_em1d/dbgspt_depend.h>
#endif
diff --git a/tkernel_source/include/tk/sysdepend/syscall_common.h b/tkernel_source/include/tk/sysdepend/syscall_common.h
index c407c00..98afc88 100644
--- a/tkernel_source/include/tk/sysdepend/syscall_common.h
+++ b/tkernel_source/include/tk/sysdepend/syscall_common.h
@@ -21,43 +21,43 @@
#ifndef __TK_SYSCALL_COMMON_H__
#define __TK_SYSCALL_COMMON_H__
-#if STD_SH7727
+#ifdef STD_SH7727
# include <tk/sysdepend/std_sh7727/cpuattr.h>
# include <tk/sysdepend/std_sh7727/cpudef.h>
#endif
-#if STD_SH7751R
+#ifdef STD_SH7751R
# include <tk/sysdepend/std_sh7751r/cpuattr.h>
# include <tk/sysdepend/std_sh7751r/cpudef.h>
#endif
-#if MIC_M32104
+#ifdef MIC_M32104
# include <tk/sysdepend/mic_m32104/cpuattr.h>
# include <tk/sysdepend/mic_m32104/cpudef.h>
#endif
-#if STD_S1C38K
+#ifdef STD_S1C38K
# include <tk/sysdepend/std_s1c38k/cpuattr.h>
# include <tk/sysdepend/std_s1c38k/cpudef.h>
#endif
-#if STD_MC9328
+#ifdef STD_MC9328
# include <tk/sysdepend/std_mc9328/cpuattr.h>
# include <tk/sysdepend/std_mc9328/cpudef.h>
#endif
-#if MIC_VR4131
+#ifdef MIC_VR4131
# include <tk/sysdepend/mic_vr4131/cpuattr.h>
# include <tk/sysdepend/mic_vr4131/cpudef.h>
#endif
-#if STD_VR5500
+#ifdef STD_VR5500
# include <tk/sysdepend/std_vr5500/cpuattr.h>
# include <tk/sysdepend/std_vr5500/cpudef.h>
#endif
-#if STD_MB87Q1100
+#ifdef STD_MB87Q1100
# include <tk/sysdepend/std_mb87q1100/cpuattr.h>
# include <tk/sysdepend/std_mb87q1100/cpudef.h>
#endif
-#if STD_SH7760
+#ifdef STD_SH7760
# include <tk/sysdepend/std_sh7760/cpuattr.h>
# include <tk/sysdepend/std_sh7760/cpudef.h>
#endif
-#if TEF_EM1D
+#ifdef TEF_EM1D
# include <tk/sysdepend/tef_em1d/cpuattr.h>
# include <tk/sysdepend/tef_em1d/cpudef.h>
#endif
diff --git a/tkernel_source/include/tk/sysdepend/sysdef_common.h b/tkernel_source/include/tk/sysdepend/sysdef_common.h
index bb1fbdc..76b3a90 100644
--- a/tkernel_source/include/tk/sysdepend/sysdef_common.h
+++ b/tkernel_source/include/tk/sysdepend/sysdef_common.h
@@ -22,34 +22,34 @@
#ifndef __TK_SYSDEF_COMMON_H__
#define __TK_SYSDEF_COMMON_H__
-#if STD_SH7727
+#ifdef STD_SH7727
# include <tk/sysdepend/std_sh7727/sysdef_depend.h>
#endif
-#if STD_SH7751R
+#ifdef STD_SH7751R
# include <tk/sysdepend/std_sh7751r/sysdef_depend.h>
#endif
-#if MIC_M32104
+#ifdef MIC_M32104
# include <tk/sysdepend/mic_m32104/sysdef_depend.h>
#endif
-#if STD_S1C38K
+#ifdef STD_S1C38K
# include <tk/sysdepend/std_s1c38k/sysdef_depend.h>
#endif
-#if STD_MC9328
+#ifdef STD_MC9328
# include <tk/sysdepend/std_mc9328/sysdef_depend.h>
#endif
-#if MIC_VR4131
+#ifdef MIC_VR4131
# include <tk/sysdepend/mic_vr4131/sysdef_depend.h>
#endif
-#if STD_VR5500
+#ifdef STD_VR5500
# include <tk/sysdepend/std_vr5500/sysdef_depend.h>
#endif
-#if STD_MB87Q1100
+#ifdef STD_MB87Q1100
# include <tk/sysdepend/std_mb87q1100/sysdef_depend.h>
#endif
-#if STD_SH7760
+#ifdef STD_SH7760
# include <tk/sysdepend/std_sh7760/sysdef_depend.h>
#endif
-#if TEF_EM1D
+#ifdef TEF_EM1D
# include <tk/sysdepend/tef_em1d/sysdef_depend.h>
#endif
diff --git a/tkernel_source/include/tk/sysdepend/syslib_common.h b/tkernel_source/include/tk/sysdepend/syslib_common.h
index db237ae..e91680e 100644
--- a/tkernel_source/include/tk/sysdepend/syslib_common.h
+++ b/tkernel_source/include/tk/sysdepend/syslib_common.h
@@ -24,34 +24,34 @@
/*
* CPU-dependent
*/
-#if STD_SH7727
+#ifdef STD_SH7727
# include <tk/sysdepend/std_sh7727/syslib_depend.h>
#endif
-#if STD_SH7751R
+#ifdef STD_SH7751R
# include <tk/sysdepend/std_sh7751r/syslib_depend.h>
#endif
-#if MIC_M32104
+#ifdef MIC_M32104
# include <tk/sysdepend/mic_m32104/syslib_depend.h>
#endif
-#if STD_S1C38K
+#ifdef STD_S1C38K
# include <tk/sysdepend/std_s1c38k/syslib_depend.h>
#endif
-#if STD_MC9328
+#ifdef STD_MC9328
# include <tk/sysdepend/std_mc9328/syslib_depend.h>
#endif
-#if MIC_VR4131
+#ifdef MIC_VR4131
# include <tk/sysdepend/mic_vr4131/syslib_depend.h>
#endif
-#if STD_VR5500
+#ifdef STD_VR5500
# include <tk/sysdepend/std_vr5500/syslib_depend.h>
#endif
-#if STD_MB87Q1100
+#ifdef STD_MB87Q1100
# include <tk/sysdepend/std_mb87q1100/syslib_depend.h>
#endif
-#if STD_SH7760
+#ifdef STD_SH7760
# include <tk/sysdepend/std_sh7760/syslib_depend.h>
#endif
-#if TEF_EM1D
+#ifdef TEF_EM1D
# include <tk/sysdepend/tef_em1d/syslib_depend.h>
#endif
diff --git a/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_calls.c b/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_calls.c
index 99525e0..b4ac6be 100644
--- a/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_calls.c
+++ b/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_calls.c
@@ -63,13 +63,13 @@ SYSCALL ER _tk_ena_dsp( void )
EXPORT FP hll_inthdr[N_INTVEC];
/* High level programming language routine (Interrupt) */
-IMPORT void inthdr_startup();
+IMPORT void inthdr_startup( void );
/* High level programming language routine (Exception) */
-IMPORT void exchdr_startup();
+IMPORT void exchdr_startup( void );
/* For default handler */
-IMPORT void defaulthdr_startup();
+IMPORT void defaulthdr_startup( void );
/*
* Interrupt handler definition
diff --git a/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_init.c b/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_init.c
index cb7c854..4332535 100644
--- a/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_init.c
+++ b/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_init.c
@@ -132,7 +132,7 @@ EXPORT void setup_texhdr( UW *ssp )
FP texhdr;
INT texcd;
UINT m;
- UW *usp;
+ UW *usp = NULL;
/* called in interrupt-disabled state */
diff --git a/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_status.h b/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_status.h
index 8f8e73a..15e18d7 100644
--- a/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_status.h
+++ b/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_status.h
@@ -112,7 +112,7 @@
*/
Inline void force_dispatch( void )
{
-IMPORT void dispatch_to_schedtsk();
+IMPORT void dispatch_to_schedtsk( void );
Asm("bx %0":: "r"(&dispatch_to_schedtsk));
}
diff --git a/tkernel_source/kernel/sysmgr/src/deviceio.c b/tkernel_source/kernel/sysmgr/src/deviceio.c
index e2e99f3..86a33be 100644
--- a/tkernel_source/kernel/sysmgr/src/deviceio.c
+++ b/tkernel_source/kernel/sysmgr/src/deviceio.c
@@ -455,7 +455,6 @@ LOCAL void abort_allrequest( OpnCB *opncb )
*/
LOCAL ER close_device( OpnCB *opncb, UINT option )
{
- ID devid;
DevCB *devcb;
INT unitno;
WaitQ waiq;
@@ -468,7 +467,6 @@ LOCAL ER close_device( OpnCB *opncb, UINT option )
devcb = opncb->devcb;
unitno = opncb->unitno;
- devid = DEVID(devcb, unitno);
/* Multiple tasks can initiate open/close processing,
so ensure processing only by one task at a time. */
diff --git a/tkernel_source/kernel/tkernel/src/config.h b/tkernel_source/kernel/tkernel/src/config.h
index f64dad2..ca92db7 100644
--- a/tkernel_source/kernel/tkernel/src/config.h
+++ b/tkernel_source/kernel/tkernel/src/config.h
@@ -172,4 +172,6 @@
*/
#define USE_KERNEL_MESSAGE (1)
+#define USE_SINGLE_STACK (0)
+
#endif /* _CONFIG_ */
diff --git a/tkernel_source/kernel/tkernel/src/subsystem.c b/tkernel_source/kernel/tkernel/src/subsystem.c
index 03b8603..0b20ecb 100644
--- a/tkernel_source/kernel/tkernel/src/subsystem.c
+++ b/tkernel_source/kernel/tkernel/src/subsystem.c
@@ -85,7 +85,7 @@ LOCAL UW *resid_bitmap;
/*
* Undefined extended SVC function
*/
-IMPORT INT no_support();
+IMPORT INT no_support( void *pk_para, FN fncd );
/*
* Initialization of subsystem control block
diff --git a/tkernel_source/monitor/cmdsvc/src/armv6/break.c b/tkernel_source/monitor/cmdsvc/src/armv6/break.c
index c82969f..42440b1 100644
--- a/tkernel_source/monitor/cmdsvc/src/armv6/break.c
+++ b/tkernel_source/monitor/cmdsvc/src/armv6/break.c
@@ -23,7 +23,7 @@
// SW breakpoint code (BKPT instruction)
#define BREAK_ARM 0xE1200070
-#define BREAK_THUMB 0xBE00
+#define BREAK_THUMB 0xBE000000
/*
breakpoint data
@@ -146,7 +146,7 @@ EXPORT W getBreakAtr(UB *name)
if (name[4] == ' ') {
for (i = 0; i < MAX_BPATR; i++) {
- if (*((UW*)brkAtr[i].name) == *((UW*)name))
+ if (memcmp(brkAtr[i].name, name, sizeof(UW)) == 0)
return brkAtr[i].atr;
}
}
@@ -282,8 +282,8 @@ EXPORT void initBreak(void)
traceMode = traceStep = stepFlg = 0;
// SW break instruction (undefined instruction)
- *((UH*)&sbpCode.b[2]) = BREAK_THUMB;
- *((UW*)&sbpCode.b[4]) = BREAK_ARM;
+ sbpCode.w[0] = BREAK_THUMB;
+ sbpCode.w[1] = BREAK_ARM;
}
/*
release breakpoint temporarily (monitor entry)
diff --git a/tkernel_source/monitor/cmdsvc/src/armv6/register.c b/tkernel_source/monitor/cmdsvc/src/armv6/register.c
index 535e7ab..3c932ce 100644
--- a/tkernel_source/monitor/cmdsvc/src/armv6/register.c
+++ b/tkernel_source/monitor/cmdsvc/src/armv6/register.c
@@ -388,7 +388,7 @@ EXPORT W isKillValid(void)
return 0;
}
-#if REF_TKOBJECT
+#ifdef REF_TKOBJECT
/*
Check whether T-Kernel/DS functions can be executed?
*/
diff --git a/tkernel_source/monitor/cmdsvc/src/command.c b/tkernel_source/monitor/cmdsvc/src/command.c
index 8d8ba28..f91bfd8 100644
--- a/tkernel_source/monitor/cmdsvc/src/command.c
+++ b/tkernel_source/monitor/cmdsvc/src/command.c
@@ -627,7 +627,7 @@ LOCAL void cmdFill(W unit)
// extract set data
if (token <= tEOC) {
- *((UW*)&dt[0]) = 0; // 0 by default
+ memset(dt, 0, sizeof(UW)); // 0 by default
n = unit;
} else {
if (isnotDLM()) return;
@@ -850,7 +850,7 @@ LOCAL void cmdGoTrace(W trace)
B [break_addr[,break_attr][,commands]]
*/
-LOCAL void cmdBreak(VOID)
+LOCAL void cmdBreak( void )
{
UW addr;
W atr, cmdlen;
@@ -933,7 +933,7 @@ LOCAL const struct {
par = 0;
if (tokenSym[2] == ' ') {
for (i = 0; proto[i].par != 0; i++) {
- if (*((UH*)tokenSym) == *((UH*)proto[i].nm)) {
+ if (memcmp(tokenSym, proto[i].nm, sizeof(UH)) == 0) {
par = proto[i].par;
break;
}
@@ -1189,7 +1189,7 @@ LOCAL W searchCommand(void)
for (i = 0; cmdTab[i].func != NULL; i++) {
if (memcmp(cmdTab[i].fnm, tokenSym, 12) == 0 ||
(tokenSym[4] == ' ' &&
- *((UW*)cmdTab[i].snm) == *((UW*)tokenSym)) )
+ memcmp(cmdTab[i].snm, tokenSym, sizeof(UW)) == 0) )
return i;
}
}
diff --git a/tkernel_source/monitor/cmdsvc/src/helpmsg.c b/tkernel_source/monitor/cmdsvc/src/helpmsg.c
index 3eaffbe..a71424b 100644
--- a/tkernel_source/monitor/cmdsvc/src/helpmsg.c
+++ b/tkernel_source/monitor/cmdsvc/src/helpmsg.c
@@ -384,9 +384,9 @@ EXPORT const HELP helpFLLO = { prSimpleHelp,
*/
EXPORT void dispTitle( void )
{
- const char **p;
+ int i;
DSP_S("\n\n");
- for ( p = Title; *p != NULL; p++ ) DSP_S(*p);
+ for ( i = 0; Title[i] != NULL; i++ ) DSP_S(Title[i]);
DSP_S("\n\n");
}
diff --git a/tkernel_source/monitor/include/tmonitor.h b/tkernel_source/monitor/include/tmonitor.h
index 4fc4eae..9a25baa 100644
--- a/tkernel_source/monitor/include/tmonitor.h
+++ b/tkernel_source/monitor/include/tmonitor.h
@@ -210,7 +210,7 @@ typedef struct {
UW top; /* area start address */
UW end; /* area end address */
UW attr; /* attribute */
-#if (CPU_ARM|CPU_I386) && VIRTUAL_ADDRESS
+#if CPU_ARM && VIRTUAL_ADDRESS
UW pa; /* physical address | page attribute */
#endif
} MEMSEG;
--
1.9.1
