laforge submitted this change.

View Change

fix some warnings and add some warning flags

Change-Id: I55e1de7fe8428a5c6cdf741cdc0ae7c47aa7c8d8
---
M ccid_common/ccid_slot_fsm.c
M sysmoOCTSIM/gcc/Makefile
M sysmoOCTSIM/main.c
M sysmoOCTSIM/usb/class/ccid/device/ccid_df.c
4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c
index 788e3ae..eb0c145 100644
--- a/ccid_common/ccid_slot_fsm.c
+++ b/ccid_common/ccid_slot_fsm.c
@@ -22,6 +22,9 @@
 #include <errno.h>
 #include <string.h>
 
+#ifdef OCTSIMFWBUILD
+#include "hal/include/hal_delay.h"
+#endif
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/timer.h>
 #include <osmocom/core/logging.h>
diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile
index a465287..0f2a909 100644
--- a/sysmoOCTSIM/gcc/Makefile
+++ b/sysmoOCTSIM/gcc/Makefile
@@ -11,7 +11,8 @@
 
 CFLAGS_CPU=-D__SAME54N19A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16
 CFLAGS=-x c -mthumb -DDEBUG -Os -ffunction-sections -fdata-sections -mlong-calls \
-       -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) -Wno-discarded-qualifiers -Werror=strict-prototypes
+       -fno-omit-frame-pointer -ggdb3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) -Wno-discarded-qualifiers -Werror=strict-prototypes -fno-common -Wno-unused-variable -Wno-unused-function -Wlarger-than=512 -Wstack-usage=255
+
 
 CFLAGS += -DLIBOSMOCORE_NO_LOGGING
 
diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c
index 9849298..79a74f8 100644
--- a/sysmoOCTSIM/main.c
+++ b/sysmoOCTSIM/main.c
@@ -17,9 +17,7 @@
 */
 
 #include <stdlib.h>
-#include <inttypes.h>
 #include <stdio.h>
-#include <math.h>
 #include <parts.h>
 #include <errno.h>
 
@@ -31,12 +29,10 @@
 
 #include "atmel_start.h"
 #include "atmel_start_pins.h"
-#include "config/hpl_gclk_config.h"
 
 #include "i2c_bitbang.h"
 #include "octsim_i2c.h"
 #include "ncn8025.h"
-#include "iso7816_3.h"
 
 #include "command.h"
 
diff --git a/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c b/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c
index e418010..2227a23 100644
--- a/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c
+++ b/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c
@@ -24,7 +24,9 @@
 #include "ccid_proto.h"
 #include "usb_includes.h"
 
+#ifdef WITH_DEBUG_CDC
 #include "cdcdf_acm_desc.h"
+#endif
 #include "usb_descriptors.h"
 
 #ifndef USB_CLASS_CCID

To view, visit change 39448. To unsubscribe, or for help writing mail filters, visit settings.