softpll-unify: header changes (no effect on rt_cpu.bin)

The commit is part of the effort in unifying softpll with wrpc-sw, and later remove the duplicated code here in wr-switch-sw. Here I copy includes/std/ from wrpc-sw, and change hw includes to be the same as in wrpc-sw. I'm aware rt/include/stdint.h is better than the new rt/include/std/stdint.h but that's it for now. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

softpll-unify: header changes (no effect on rt_cpu.bin)
The commit is part of the effort in unifying softpll with wrpc-sw, and later remove the duplicated code here in wr-switch-sw. Here I copy includes/std/ from wrpc-sw, and change hw includes to be the same as in wrpc-sw. I'm aware rt/include/stdint.h is better than the new rt/include/std/stdint.h but that's it for now. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
d0366747 · Alessandro Rubini · 21225afc · d0366747 · d0366747 · d0366747
Commit d0366747 authored Dec 04, 2013 by Alessandro Rubini
6 changed files
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -15,7 +15,7 @@ OBJS_PLATFORM=target/lm32/crt0.o target/lm32/irq.o
 CC=$(CROSS_COMPILE)gcc
 OBJCOPY=$(CROSS_COMPILE)objcopy
 OBJDUMP=$(CROSS_COMPILE)objdump
-CFLAGS= $(CFLAGS_PLATFORM) -ffunction-sections -fdata-sections -O3 -Iinclude -include include/trace.h  -ffreestanding -Iipc -I$(LIBSOFTPLL_DIR) -I.
+CFLAGS= $(CFLAGS_PLATFORM) -ffunction-sections -fdata-sections -O3 -Iinclude/std -Iinclude -include include/trace.h  -ffreestanding -Iipc -I$(LIBSOFTPLL_DIR) -I.
 LDFLAGS= $(LDFLAGS_PLATFORM) -Wl,--gc-sections -O3 -Iinclude -ffreestanding 
 SIZE = $(CROSS_COMPILE)size
 OBJS += $(OBJS_PLATFORM)

--- a/rt/include/std/inttypes.h
+++ b/rt/include/std/inttypes.h
+#ifndef __WRAPPED_INTTYPES_H
+#define __WRAPPED_INTTYPES_H
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef signed long long uint64_t;
+
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed int int32_t;
+typedef signed long long int64_t;
+
+#define UINT32_MAX 4294967295U
+
+#endif
--- a/rt/include/std/stdint.h
+++ b/rt/include/std/stdint.h
+#ifndef __STDINT_H__
+#define __STDINT_H__
+
+#include<inttypes.h>
+
+#endif
--- a/rt/include/std/unistd.h
+++ b/rt/include/std/unistd.h
+/* usleep */
+#include <syscon.h>
--- a/rt/softpll/hw/pps_gen_regs.h
+++ b/rt/softpll/hw/pps_gen_regs.h
@@ -14,7 +14,7 @@
 #ifndef __WBGEN2_REGDEFS_PPS_GEN_WB_WB
 #define __WBGEN2_REGDEFS_PPS_GEN_WB_WB

-#include <stdint.h>
+#include <inttypes.h>

 #if defined( __GNUC__)
 #define PACKED __attribute__ ((packed))

--- a/rt/softpll/hw/softpll_regs.h
+++ b/rt/softpll/hw/softpll_regs.h
@@ -14,7 +14,7 @@
 #ifndef __WBGEN2_REGDEFS_SPLL_WB_SLAVE_WB
 #define __WBGEN2_REGDEFS_SPLL_WB_SLAVE_WB

-#include <stdint.h>
+#include <inttypes.h>

 #if defined( __GNUC__)
 #define PACKED __attribute__ ((packed))