It is 12 years after C99 standardization - switch to stdint.h and its types.

The old types.h is deprecated and not used by sysless itself now.
If the standard C99 stdint.h is missing in the build environment,
change the compiler.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/arch/arm/generic/libs/misc/system_stub.h b/arch/arm/generic/libs/misc/system_stub.h
index d697635a68a1ef80026a058bc7f1ec4314129a11..186c16b3de2d0bf63b868e76fdcb27b429600bfb 100644 (file)
--- a/arch/arm/generic/libs/misc/system_stub.h
+++ b/arch/arm/generic/libs/misc/system_stub.h
@@ -1,7 +1,7 @@
 #ifndef _SYSTEM_STUB_H_
 #define _SYSTEM_STUB_H_
 
-#include <types.h>
+#include <stdint.h>
 
 typedef struct system_stub_ops_t {
   int (*open)(const char * path, int flags, ...);

diff --git a/arch/arm/mach-lpc21xx/libs/hal/hal.c b/arch/arm/mach-lpc21xx/libs/hal/hal.c
index 4fd41caa28af2811e7e876e93338f4562c79e08b..f810548aa6695cdb241c7383d1d83818f5c1eed8 100644 (file)
--- a/arch/arm/mach-lpc21xx/libs/hal/hal.c
+++ b/arch/arm/mach-lpc21xx/libs/hal/hal.c
@@ -2,7 +2,7 @@
 #include <cpu_def.h>
 #include <hal_ints.h>
 #include <hal_intr.h>
-#include <types.h>
+#include <stdint.h>
  
 // -------------------------------------------------------------------------
 // Hardware init

diff --git a/arch/arm/mach-lpc23xx/libs/hal/hal.c b/arch/arm/mach-lpc23xx/libs/hal/hal.c
index 1111ed9acea420e47445fd27398ae708a3f01d9b..e29a8efba4400b6826445e216b52d174f154d3a9 100644 (file)
--- a/arch/arm/mach-lpc23xx/libs/hal/hal.c
+++ b/arch/arm/mach-lpc23xx/libs/hal/hal.c
@@ -1,7 +1,7 @@
 #include <system_def.h>
 #include <hal_ints.h>
 #include <hal_intr.h>
-#include <types.h>
+#include <stdint.h>
  
 // -------------------------------------------------------------------------
 // Hardware init

diff --git a/arch/generic/defines/lt_timer.h b/arch/generic/defines/lt_timer.h
index b5d39df15bcaeb18a1e16a7afc517f8573dd9c1b..7acde9edf18dcb47999cf359c16570a85a19d372 100644 (file)
--- a/arch/generic/defines/lt_timer.h
+++ b/arch/generic/defines/lt_timer.h
@@ -1,7 +1,7 @@
 #ifndef _LT_TIMER_H
 #define _LT_TIMER_H
 
-#include <types.h>
+#include <stdint.h>
 #include <lt_timer_types.h>
 
 #include <cpu_def.h>

diff --git a/arch/h8300/generic/bloader/bloader.c b/arch/h8300/generic/bloader/bloader.c
index ec637c0a863b89da7ef7c7fb1715b46017e8ba5d..b9b8a4804940656805436de7eba88b114004fade 100644 (file)
--- a/arch/h8300/generic/bloader/bloader.c
+++ b/arch/h8300/generic/bloader/bloader.c
@@ -1,5 +1,5 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <mcu_regs.h>
 //#include <periph/chmod_lcd.h>
@@ -136,11 +136,11 @@ void deb_led_blink() {
 
 int main()
 {
-  __u8 *p;
+  uint8_t *p;
 
   _setup_board(); /* Provided in bspbase library of each board */
 
-  p=(__u8*)&deb_wr_hex;
+  p=(uint8_t*)&deb_wr_hex;
   if(p>=IRAM_START) p=" IRAM";
 #ifdef SRAM_START
   else if(p>=SRAM_START) p=" SRAM";
@@ -148,7 +148,7 @@ int main()
 #ifdef XRAM_START
   else if(p>=XRAM_START) p=" XRAM";
 #endif
-  else if(p>(__u8*)0x4000l) p=" FLSHU";
+  else if(p>(uint8_t*)0x4000l) p=" FLSHU";
   else p=" FLSHB";
 
 

diff --git a/arch/h8300/generic/drivers/bit_iic.c b/arch/h8300/generic/drivers/bit_iic.c
index bd3c3ace30fae7348a373ae2ae13d7f186ec5a97..f4ca9aa7eb10c076e7905843f1ab5fd4d8d9d3c1 100644 (file)
--- a/arch/h8300/generic/drivers/bit_iic.c
+++ b/arch/h8300/generic/drivers/bit_iic.c
@@ -9,7 +9,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 //#include <h8s2633h.h>
 #include <mcu_regs.h>
@@ -417,8 +417,8 @@ p /x *$ICCR0
 
 #endif
 
-__u8 test_buf_tx[TEST_BUF]={0x10,0x11,0x22,0x33};
-__u8 test_buf_rx[TEST_BUF];
+uint8_t test_buf_tx[TEST_BUF]={0x10,0x11,0x22,0x33};
+uint8_t test_buf_rx[TEST_BUF];
 
 int test_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg);
 
@@ -458,8 +458,8 @@ int test_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg)
 
 unsigned t_mkbd_cnt=0;
 
-__u8 t_mkbd_buf_tx[TEST_BUF];
-__u8 t_mkbd_buf_rx[TEST_BUF];
+uint8_t t_mkbd_buf_tx[TEST_BUF];
+uint8_t t_mkbd_buf_rx[TEST_BUF];
 
 int t_mkbd_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg);
 
@@ -479,7 +479,7 @@ iic_msg_head_t t_mkbd_msg={
 int t_mkbd_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg)
 {
   unsigned u,v;
-  __u8 *p;
+  uint8_t *p;
   
   if(code==IIC_MSG_CB_PROC) return test_callback(ifc, code, msg);
   switch(code){
@@ -498,7 +498,7 @@ int t_mkbd_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg)
 }
 
 
-int test_rd_arr(char **ps, __u8 *buf, int n)
+int test_rd_arr(char **ps, uint8_t *buf, int n)
 {
   long val;
   int c;

diff --git a/arch/h8300/generic/drivers/h8_iic.c b/arch/h8300/generic/drivers/h8_iic.c
index 682a5628aeb14041b616f5369276c966a95ea8a0..9e133300509df1d556ea988b69a27332ad877786 100644 (file)
--- a/arch/h8300/generic/drivers/h8_iic.c
+++ b/arch/h8300/generic/drivers/h8_iic.c
@@ -10,7 +10,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <mcu_regs.h>
 #include <system_def.h>
@@ -186,7 +186,7 @@ static int iicx_sfnc_ms_err(struct iic_ifc *ifc, int code);
 static int iicx_sfnc_default(struct iic_ifc *ifc, int code)
 {
   iic_msg_head_t *msg;
-  __u8 v_icsr;
+  uint8_t v_icsr;
   
   ifc->msg_act=NULL;
   v_icsr=*IIC_ICSR;
@@ -279,7 +279,7 @@ static int iicx_sfnc_ms_start(struct iic_ifc *ifc, int code)
 static int iicx_sfnc_ms_tx(struct iic_ifc *ifc, int code)
 {
   iic_msg_head_t *msg=ifc->msg_act;
-  __u8 v_icsr;
+  uint8_t v_icsr;
   unsigned saveif;
   
   /* mstx[8] Test for acknowledgement by the designated slave device. */
@@ -345,8 +345,8 @@ static int iicx_sfnc_ms_rx0(struct iic_ifc *ifc, int code)
 /* mstx[7] IRQ after wait for 1 byte to be transmitted. */
 static int iicx_sfnc_ms_rx(struct iic_ifc *ifc, int code)
 {
-  __u8 dummy;
-  __u8 v_icsr;
+  uint8_t dummy;
+  uint8_t v_icsr;
   unsigned saveif;
   
   iic_msg_head_t *msg=ifc->msg_act;
@@ -525,7 +525,7 @@ void iicx_isr(void) __attribute__ ((interrupt_handler));
 
 void iicx_isr(void)
 {
-  __u8 c;
+  uint8_t c;
   int ret;
   iic_ifc_t *ifc=&iicx_ifc;
   
@@ -697,8 +697,8 @@ p /x *$ICCR0
 
 #endif
 
-__u8 test_buf_tx[TEST_BUF]={0x10,0x11,0x22,0x33};
-__u8 test_buf_rx[TEST_BUF];
+uint8_t test_buf_tx[TEST_BUF]={0x10,0x11,0x22,0x33};
+uint8_t test_buf_rx[TEST_BUF];
 
 int test_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg);
 
@@ -738,8 +738,8 @@ int test_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg)
 
 unsigned t_mkbd_cnt=0;
 
-__u8 t_mkbd_buf_tx[TEST_BUF];
-__u8 t_mkbd_buf_rx[TEST_BUF];
+uint8_t t_mkbd_buf_tx[TEST_BUF];
+uint8_t t_mkbd_buf_rx[TEST_BUF];
 
 int t_mkbd_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg);
 
@@ -759,7 +759,7 @@ iic_msg_head_t t_mkbd_msg={
 int t_mkbd_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg)
 {
   unsigned u,v;
-  __u8 *p;
+  uint8_t *p;
   
   if(code==IIC_MSG_CB_PROC) return test_callback(ifc, code, msg);
   switch(code){
@@ -778,7 +778,7 @@ int t_mkbd_callback(struct iic_ifc *ifc, int code, struct iic_msg_head *msg)
 }
 
 
-int test_rd_arr(char **ps, __u8 *buf, int n)
+int test_rd_arr(char **ps, uint8_t *buf, int n)
 {
   long val;
   int c;
@@ -893,11 +893,11 @@ int cmd_do_iicpoll(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
 
 int cmd_do_iicstat(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
 {
-  __u8 v_iccr, v_icsr;
+  uint8_t v_iccr, v_icsr;
   int opchr=*param[2];
   char *p=param[3];
   char s[10];
-  volatile __u8 *pb;
+  volatile uint8_t *pb;
   long val;
   unsigned short saveif;
 

diff --git a/arch/h8300/generic/drivers/periph/iic_ifc.h b/arch/h8300/generic/drivers/periph/iic_ifc.h
index d17d2ceb0aedf6ba451918004568a775f0e563fd..930ef66dd68afd00b876fe5c9af5890bcd5c221f 100644 (file)
--- a/arch/h8300/generic/drivers/periph/iic_ifc.h
+++ b/arch/h8300/generic/drivers/periph/iic_ifc.h
@@ -30,16 +30,16 @@ struct iic_ifc;
 #define IIC_MSG_CB_PROC  0x400
 
 typedef struct iic_msg_head {
-    __u16 flags;       /* message flags */
-    __u8  sl_cmd;      /* command for slave queue lookup */
-    __u8  sl_msk;      /* sl_cmd match mask */
-    __u16 addr;                /* message destination address */
-    __u16 tx_rq;       /* requested TX transfer length */
-    __u16 rx_rq;       /* requested RX transfer length */
-    __u16 tx_len;      /* finished TX transfer length */
-    __u16 rx_len;      /* finished RX transfer length */
-    __u8 *tx_buf;      /* pointer to TX data */
-    __u8 *rx_buf;      /* pointer to RX data */
+    uint16_t flags;    /* message flags */
+    uint8_t  sl_cmd;   /* command for slave queue lookup */
+    uint8_t  sl_msk;   /* sl_cmd match mask */
+    uint16_t addr;     /* message destination address */
+    uint16_t tx_rq;    /* requested TX transfer length */
+    uint16_t rx_rq;    /* requested RX transfer length */
+    uint16_t tx_len;   /* finished TX transfer length */
+    uint16_t rx_len;   /* finished RX transfer length */
+    uint8_t *tx_buf;   /* pointer to TX data */
+    uint8_t *rx_buf;   /* pointer to RX data */
     struct iic_msg_head *prev;
     struct iic_msg_head *next;
     struct iic_msg_head **on_queue;
@@ -53,8 +53,8 @@ typedef int (iic_ctrl_fnc_t)(struct iic_ifc *ifc, int ctrl, void *p);
 #define IIC_IFC_ON 1
 
 typedef struct iic_ifc {
-    __u8 flags;
-    __u16 self_addr;
+    uint8_t flags;
+    uint16_t self_addr;
     iic_msg_head_t *master_queue;
     iic_msg_head_t *slave_queue;
     iic_msg_head_t *proc_queue;

diff --git a/arch/h8300/generic/drivers/periph/sci_rs232.h b/arch/h8300/generic/drivers/periph/sci_rs232.h
index 0941e5d6847199e2eb9ff6e95064065b2807e20d..5931c2cda89d87804e2b581582eb801ad2bb1c10 100644 (file)
--- a/arch/h8300/generic/drivers/periph/sci_rs232.h
+++ b/arch/h8300/generic/drivers/periph/sci_rs232.h
@@ -43,10 +43,10 @@
 #define m_BRR()
 
 typedef struct{
-    __u8 *buf_beg; //start of adress structur
-    __u8 *buf_end; //end of adress structur - beg+sizeof(struct)
-    __u8 *ip;      //actual position at queue
-    __u8 *op;      //position first unread char of queue
+    uint8_t *buf_beg; //start of adress structur
+    uint8_t *buf_end; //end of adress structur - beg+sizeof(struct)
+    uint8_t *ip;      //actual position at queue
+    uint8_t *op;      //position first unread char of queue
 } sci_que_t;
 
 typedef struct sci_info {
@@ -67,9 +67,9 @@ typedef struct sci_info {
   /* Queues */
   sci_que_t sci_rs232_que_in;
   sci_que_t sci_rs232_que_out;
-  __u8 *sci_rs232_buf_in;
+  uint8_t *sci_rs232_buf_in;
   int sci_rs232_buf_in_size;
-  __u8 *sci_rs232_buf_out;
+  uint8_t *sci_rs232_buf_out;
   int sci_rs232_buf_out_size;
 } sci_info_t;
 

diff --git a/arch/h8300/generic/drivers/sci_rs232.c b/arch/h8300/generic/drivers/sci_rs232.c
index d4de70146fe57a0da86bc8cf64938621c1fa225e..64dd66107f15932c9ec71b8ae7b7935661a823a3 100644 (file)
--- a/arch/h8300/generic/drivers/sci_rs232.c
+++ b/arch/h8300/generic/drivers/sci_rs232.c
@@ -16,7 +16,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <mcu_regs.h>
 #include <system_def.h>
@@ -26,7 +26,7 @@
 /* put character c into queue, if full return -1 */
 inline int sci_que_put(sci_que_t *q, int c)
 {
-  __u8 *p;
+  uint8_t *p;
   p=q->ip;
   *(p++)=c;
   if(p==q->buf_end) p=q->buf_beg;
@@ -38,7 +38,7 @@ inline int sci_que_put(sci_que_t *q, int c)
 /* get character from queue, if empty return -1 */
 inline int sci_que_get(sci_que_t *q)
 {
-  __u8 *p;
+  uint8_t *p;
   int  c;
   p=q->op;
   if(p==q->ip) return -1;
@@ -52,13 +52,13 @@ inline int sci_que_get(sci_que_t *q)
 /*return free space in queue*/
 inline int sci_que_freecnt(sci_que_t *q)
 {
-  __u8 *ip=q->ip,*op=q->op;
+  uint8_t *ip=q->ip,*op=q->op;
   return op-ip-1+(op<=ip?q->buf_end-q->buf_beg:0);
 }
 
 inline int sci_que_incnt(sci_que_t *q)
 {
-  __u8 *ip=q->ip,*op=q->op;
+  uint8_t *ip=q->ip,*op=q->op;
   return ip-op+(ip<op?q->buf_end-q->buf_beg:0);
 }
 

diff --git a/arch/h8300/generic/libs/boot/boot.c b/arch/h8300/generic/libs/boot/boot.c
index 479d5b9104c9893a8b903fea3df1a6cf32d3197d..db680da315f04b4bd5ef7ec3348c0b03f9b7ff60 100644 (file)
--- a/arch/h8300/generic/libs/boot/boot.c
+++ b/arch/h8300/generic/libs/boot/boot.c
@@ -1,4 +1,4 @@
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <mcu_regs.h>
 #include <system_def.h>
@@ -25,7 +25,7 @@ void RelocatedProgMode(unsigned long where, unsigned baud)
   unsigned long reloc_offs=where-(unsigned long)&__boot_fn_start;
   size_t reloc_size=&__boot_fn_end-&__boot_fn_start;
   ProgMode_ptr=&ProgMode;
-  (__u8*)ProgMode_ptr+=reloc_offs;
+  (uint8_t*)ProgMode_ptr+=reloc_offs;
   memcpy((char*)where,&__boot_fn_start,reloc_size);
   (*ProgMode_ptr)(baud);
 }
@@ -34,7 +34,7 @@ void flash_loader(void)
 {
   SCIInit(HIT_LOAD_BAUD);
 
-  if((__u8*)&__boot_fn_start<(__u8*)0xff0000)
+  if((uint8_t*)&__boot_fn_start<(uint8_t*)0xff0000)
     RelocatedProgMode(0xffb000,HIT_LOAD_BAUD);
    else
     ProgMode(HIT_LOAD_BAUD);

diff --git a/arch/h8300/generic/libs/boot/boot_fn.c b/arch/h8300/generic/libs/boot/boot_fn.c
index f46f3af4352b5aa2deef1d5daad1dbfa987d00a9..ccaf3afd8813ea1782b8710b601ecb05797d426c 100644 (file)
--- a/arch/h8300/generic/libs/boot/boot_fn.c
+++ b/arch/h8300/generic/libs/boot/boot_fn.c
@@ -1,4 +1,4 @@
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <system_def.h>
 //#include <h8s2633h.h>
@@ -25,8 +25,8 @@
 #ifdef WITH_EXTERNAL_FLASH
   #define EXTERNAL_FLASH_START 0x40000
   #define EXTERNAL_FLASH_END (0x40000+0xfffff)
-  int ExtFlProgRow(__u8 *addr, __u8 *data);
-  int ExtFlErase(__u8 *addr);
+  int ExtFlProgRow(uint8_t *addr, uint8_t *data);
+  int ExtFlErase(uint8_t *addr);
 #endif /*WITH_EXTERNAL_FLASH*/
 
 
@@ -113,7 +113,7 @@ int FlAdr2Blk(unsigned long adr)
 /* Check if block number is blank */
 int FlTest(int bl)
 {
-  __u16 *p, *pe;
+  uint16_t *p, *pe;
   unsigned long *blocks;
   blocks = &flash_blocks[0];
   
@@ -123,8 +123,8 @@ int FlTest(int bl)
   /* No software control over Flash/External select */
   /* *BCRL=(*BCRL & (EAE ^ 0x0ff)); */
 
-  p=(__u16*)blocks[bl];
-  pe=(__u16*)blocks[bl+1];
+  p=(uint16_t*)blocks[bl];
+  pe=(uint16_t*)blocks[bl+1];
   while(p<pe){
     *p=0xffff;
     FlWait(2);
@@ -203,19 +203,19 @@ void FlProgPulse(int time_zx)
 }
 
 /* Program data to address */
-int FlProgRow(__u8 *adr, __u8 *data)
+int FlProgRow(uint8_t *adr, uint8_t *data)
 {
-  __u8 prog_data[FLASH_ROW];
+  uint8_t prog_data[FLASH_ROW];
   int i;
   int m;
   int n;
-  __u8 *x;
-  __u8 c,d;
+  uint8_t *x;
+  uint8_t c,d;
   if((unsigned long)adr & (FLASH_ROW-1)) return -EBOOT_ROW_BEGIN;
   if((*FLM_FLMCR1 & FLMCR1_FWEm)==0 ) return -EBOOT_NO_FWE;
  #ifdef WITH_EXTERNAL_FLASH
-  if(((__u32)adr>=EXTERNAL_FLASH_START)&&
-     ((__u32)adr<=EXTERNAL_FLASH_END)){
+  if(((uint32_t)adr>=EXTERNAL_FLASH_START)&&
+     ((uint32_t)adr<=EXTERNAL_FLASH_END)){
     return ExtFlProgRow(adr,data);
   }
  #endif /*WITH_EXTERNAL_FLASH*/
@@ -246,9 +246,9 @@ int FlProgRow(__u8 *adr, __u8 *data)
     i=0;
     x=adr;
     for(i=0;i<FLASH_ROW;i+=2,x+=2){
-      *(__u16*)x=0xffff;
+      *(uint16_t*)x=0xffff;
       FlWait(2);               /*epsilon*/
-      *(__u16*)(prog_data+i)=*(__u16*)x;
+      *(uint16_t*)(prog_data+i)=*(uint16_t*)x;
     } 
     *FLM_FLMCR1&=FLMCR1_SWE1m; /*clear PV1*/
     FlWait(2);                 /*ny*/
@@ -261,7 +261,7 @@ int FlProgRow(__u8 *adr, __u8 *data)
        if(c!=d) {
          m=1;       /* Reprogram needed */
           /* DEB_BLOG(0xEE000000+(long)x); */
-          /* DEB_BLOG(0xEF000000+(__u16)(c<<8)+(__u8)d); */
+          /* DEB_BLOG(0xEF000000+(uint16_t)(c<<8)+(uint8_t)d); */
        }
         *x=d|c;
        prog_data[i]=d|~c;
@@ -475,19 +475,19 @@ int SCIAutoBaud(void)
 #define EXTFL_manid       1 
 #define EXTFL_devid       0x2258
 
-#define FLASH_WR16(addr,val) (*(volatile __u16*)(addr)=(val))
-#define FLASH_RD16(addr) (*(volatile __u16*)(addr))
+#define FLASH_WR16(addr,val) (*(volatile uint16_t*)(addr)=(val))
+#define FLASH_RD16(addr) (*(volatile uint16_t*)(addr))
 
 /* Program data to address */
-int ExtFlProgRow(__u8 *addr, __u8 *data)
+int ExtFlProgRow(uint8_t *addr, uint8_t *data)
 {
   /*FLASH_ROW*/;
   int ret=0;
   int cnt=FLASH_ROW/2;
-  __u16 old,new,val;
-  __u32 a=(__u32)addr&~EXTFL_addr_mask;
+  uint16_t old,new,val;
+  uint32_t a=(uint32_t)addr&~EXTFL_addr_mask;
   while(cnt--){
-    val=*((__u16*)data)++;
+    val=*((uint16_t*)data)++;
     /* security sequence */
     FLASH_WR16(a+EXTFL_reg1_addr,EXTFL_cmd_unlock1);
     FlWait(2);
@@ -513,16 +513,16 @@ int ExtFlProgRow(__u8 *addr, __u8 *data)
     FLASH_WR16(a,EXTFL_cmd_reset);
     FlWait(2);
     if(FLASH_RD16(addr)!=val) return -EBOOT_EXT_FLASH_VERIFY;
-    ((__u16*)addr)++;
+    ((uint16_t*)addr)++;
   }
   return 0;
 }
 
-int ExtFlErase(__u8 *addr)
+int ExtFlErase(uint8_t *addr)
 {
-  __u16 old,new;
+  uint16_t old,new;
   int ret=0;
-  __u32 a=(__u32)addr&~EXTFL_addr_mask;
+  uint32_t a=(uint32_t)addr&~EXTFL_addr_mask;
   /* security sequence */
   FLASH_WR16(a+EXTFL_reg1_addr,EXTFL_cmd_unlock1);
   FlWait(2);
@@ -537,7 +537,7 @@ int ExtFlErase(__u8 *addr)
   FLASH_WR16(a+EXTFL_reg2_addr,EXTFL_cmd_unlock2);
   FlWait(2);
   /* select erase range */
-  a=(__u32)addr;
+  a=(uint32_t)addr;
   FLASH_WR16(a+EXTFL_reg1_addr,EXTFL_erase_all);
   FlWait(2);
   old=FLASH_RD16(addr);
@@ -646,7 +646,7 @@ void ProgMode(unsigned baud)
                 j=0;
                 break;
               }
-              DEB_BLOG(0xEA000000|(__u32)adr|((__u8)j&0x7f));
+              DEB_BLOG(0xEA000000|(uint32_t)adr|((uint8_t)j&0x7f));
               DEB_WR_HEX(j,2);  /*!!!*/
              adr+=FLASH_ROW;
              j=0;
@@ -691,7 +691,7 @@ void ProgMode(unsigned baud)
                         else SCISend(0xFF);
          #ifdef WITH_EXTERNAL_FLASH
          }else if(c==100){
-            if(ExtFlErase((__u8*)EXTERNAL_FLASH_START)==0)
+            if(ExtFlErase((uint8_t*)EXTERNAL_FLASH_START)==0)
               SCISend(0x5A); else SCISend(0xFF);
          #endif /*WITH_EXTERNAL_FLASH*/
          }else SCISend(0xFE);

diff --git a/arch/h8300/generic/libs/boot/boot_fn.h b/arch/h8300/generic/libs/boot/boot_fn.h
index 036d066c50259c6fa075945a04bdf7e6fb82f56f..d929aa1635adca91da86810e01e30831f8e89be6 100644 (file)
--- a/arch/h8300/generic/libs/boot/boot_fn.h
+++ b/arch/h8300/generic/libs/boot/boot_fn.h
@@ -1,7 +1,7 @@
 #ifndef _boot_fn_H
 #define _boot_fn_H
 
-#include <types.h>
+#include <stdint.h>
 
 /* Size of a flash row */
 #define FLASH_ROW 128
@@ -25,7 +25,7 @@ void wdg_disable();
 void wdg_clear();
 int FlTest(int bl);
 int FlErase(int bl);
-int FlProgRow(__u8 *adr, __u8 *data);
+int FlProgRow(uint8_t *adr, uint8_t *data);
 int SCIAutoBaud(void);
 int SCIInit(unsigned baud);
 volatile int SCISend(unsigned char c);

diff --git a/arch/h8300/generic/libs/boot/loader.c b/arch/h8300/generic/libs/boot/loader.c
index 1e34b06a37ee7199be95b2e7f4dffa44495d146b..ab66d236ce42a0d26e31e00ab8d9662483bf9ec7 100644 (file)
--- a/arch/h8300/generic/libs/boot/loader.c
+++ b/arch/h8300/generic/libs/boot/loader.c
@@ -1,4 +1,4 @@
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <system_def.h>
 //#include <h8s2633h.h>

diff --git a/arch/h8300/generic/libs/misc/excptvec.c b/arch/h8300/generic/libs/misc/excptvec.c
index 711f22010966376ece4999cc374ad53f9cd20c67..03e5bf1740dc3b30466075e6bafa49f509db4ef3 100644 (file)
--- a/arch/h8300/generic/libs/misc/excptvec.c
+++ b/arch/h8300/generic/libs/misc/excptvec.c
@@ -21,28 +21,28 @@
 
 void *excptvec_get(int vectnum)
 {
-  __u32 *pvect;
-  pvect=(__u32*)((__u32)(vectnum<<2)+0);
+  uint32_t *pvect;
+  pvect=(uint32_t*)((uint32_t)(vectnum<<2)+0);
   return (void*)*pvect;
 }
 
 
 void *excptvec_set(int vectnum,void *vect)
 {
-  __u32 *pvect;
+  uint32_t *pvect;
   void *ovect;
-  pvect=(__u32*)((__u32)(vectnum<<2)+0);
+  pvect=(uint32_t*)((uint32_t)(vectnum<<2)+0);
   ovect=(void*)*pvect;
-  *pvect=(__u32)vect;
+  *pvect=(uint32_t)vect;
   return ovect;
 }
 
 
 int excptvec_initfill(void *fill_vect, int force_all)
 {
-  __u32 *pvect;
+  uint32_t *pvect;
   int i;
-  __u32 l;
+  uint32_t l;
 
 #ifdef CONFIG_USE_EXR_LEVELS
   *SYS_SYSCR = *SYS_SYSCR | 1*SYSCR_INTM1m;
@@ -53,9 +53,9 @@ int excptvec_initfill(void *fill_vect, int force_all)
   }
   
   for(i=0,pvect=0;i<128;i++,pvect++){
-    l=(__u32)*pvect;
+    l=(uint32_t)*pvect;
     if((l==0)||(l==0xffffffff)||force_all)
-      *pvect=(__u32)fill_vect;
+      *pvect=(uint32_t)fill_vect;
   }
   
   return 0;

diff --git a/arch/h8300/generic/libs/misc/system_stub.c b/arch/h8300/generic/libs/misc/system_stub.c
index b8c902b0c331fb1aaa4447988fe3ce0b160e553f..2745ef3067637ed25942e78721d86756b4e1ff2f 100644 (file)
--- a/arch/h8300/generic/libs/misc/system_stub.c
+++ b/arch/h8300/generic/libs/misc/system_stub.c
@@ -10,7 +10,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <sys/stat.h>
 #include <cpu_def.h>

diff --git a/arch/h8300/mach-2633/defines/h8s2633h.h b/arch/h8300/mach-2633/defines/h8s2633h.h
index d290c8e3752b46bfd69e764127b2ba8b87156240..eb96df91a6ac4e1d7862c2ff3fcf0fa74e0173e2 100644 (file)
--- a/arch/h8300/mach-2633/defines/h8s2633h.h
+++ b/arch/h8300/mach-2633/defines/h8s2633h.h
@@ -14,11 +14,11 @@
 
 #ifndef __ASSEMBLY__
 
-#include <types.h>
+#include <stdint.h>
 
-#define __PORT8  (volatile __u8  * const)
-#define __PORT16 (volatile __u16 * const)
-#define __PORT32 (volatile __u32 * const)
+#define __PORT8  (volatile uint8_t  * const)
+#define __PORT16 (volatile uint16_t * const)
+#define __PORT32 (volatile uint32_t * const)
 
 #else  /* __ASSEMBLY__ */
 #define __PORT8

diff --git a/arch/h8300/mach-2633/drivers/periph/sci_regs.h b/arch/h8300/mach-2633/drivers/periph/sci_regs.h
index 9b436b4077723d366e4f2d232dea2d79bc39a7a0..54710b159c6eb9c2ed5e9b6099c2689ca0ea80e7 100644 (file)
--- a/arch/h8300/mach-2633/drivers/periph/sci_regs.h
+++ b/arch/h8300/mach-2633/drivers/periph/sci_regs.h
@@ -17,16 +17,16 @@
 #ifndef _SCI_REGS_H
 #define _SCI_REGS_H
 
-#include <types.h>
+#include <stdint.h>
 
 struct sci_regs {
-    volatile __u8  rs232_smr;
-    volatile __u8  rs232_brr;
-    volatile __u8  rs232_scr;
-    volatile __u8  rs232_tdr;
-    volatile __u8  rs232_ssr;
-    volatile __u8  rs232_rdr;
-    volatile __u8  rs232_scmr;
+    volatile uint8_t  rs232_smr;
+    volatile uint8_t  rs232_brr;
+    volatile uint8_t  rs232_scr;
+    volatile uint8_t  rs232_tdr;
+    volatile uint8_t  rs232_ssr;
+    volatile uint8_t  rs232_rdr;
+    volatile uint8_t  rs232_scmr;
 };
 
   

diff --git a/arch/h8300/mach-2638/defines/h8s2638h.h b/arch/h8300/mach-2638/defines/h8s2638h.h
index af4b302a62087b5e74706b0df29c354213ab17be..d98ce501ae5ed308d82177e8d1f3f307445592ae 100644 (file)
--- a/arch/h8300/mach-2638/defines/h8s2638h.h
+++ b/arch/h8300/mach-2638/defines/h8s2638h.h
@@ -12,11 +12,11 @@
 
 #ifndef __ASSEMBLY__
 
-#include <types.h>
+#include <stdint.h>
 
-#define __PORT8  (volatile __u8  * const)
-#define __PORT16 (volatile __u16 * const)
-#define __PORT32 (volatile __u32 * const)
+#define __PORT8  (volatile uint8_t  * const)
+#define __PORT16 (volatile uint16_t * const)
+#define __PORT32 (volatile uint32_t * const)
 
 #else  /* __ASSEMBLY__ */
 #define __PORT8

diff --git a/arch/h8300/mach-2638/drivers/periph/sci_regs.h b/arch/h8300/mach-2638/drivers/periph/sci_regs.h
index 9b436b4077723d366e4f2d232dea2d79bc39a7a0..54710b159c6eb9c2ed5e9b6099c2689ca0ea80e7 100644 (file)
--- a/arch/h8300/mach-2638/drivers/periph/sci_regs.h
+++ b/arch/h8300/mach-2638/drivers/periph/sci_regs.h
@@ -17,16 +17,16 @@
 #ifndef _SCI_REGS_H
 #define _SCI_REGS_H
 
-#include <types.h>
+#include <stdint.h>
 
 struct sci_regs {
-    volatile __u8  rs232_smr;
-    volatile __u8  rs232_brr;
-    volatile __u8  rs232_scr;
-    volatile __u8  rs232_tdr;
-    volatile __u8  rs232_ssr;
-    volatile __u8  rs232_rdr;
-    volatile __u8  rs232_scmr;
+    volatile uint8_t  rs232_smr;
+    volatile uint8_t  rs232_brr;
+    volatile uint8_t  rs232_scr;
+    volatile uint8_t  rs232_tdr;
+    volatile uint8_t  rs232_ssr;
+    volatile uint8_t  rs232_rdr;
+    volatile uint8_t  rs232_scmr;
 };
 
   

diff --git a/arch/m68k/generic/defines/sim.h b/arch/m68k/generic/defines/sim.h
index 34f9a803c959fc19a8988d3f11499a20418a6d3d..5491bda6807a8d31e68fa564aff6046a2fa37966 100644 (file)
--- a/arch/m68k/generic/defines/sim.h
+++ b/arch/m68k/generic/defines/sim.h
@@ -51,7 +51,7 @@
 
 
 #ifndef __ASSEMBLER__
-#include <types.h>
+#include <stdint.h>
 #endif
 
 /* SAM-- shift and mask */

diff --git a/arch/m68k/generic/drivers/qsm_rs232.c b/arch/m68k/generic/drivers/qsm_rs232.c
index 2f05bd1b458660e460116c0f0126276a0063feca..86caea92c38fb865196c99c928938a62a6a3a901 100644 (file)
--- a/arch/m68k/generic/drivers/qsm_rs232.c
+++ b/arch/m68k/generic/drivers/qsm_rs232.c
@@ -9,7 +9,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <sim.h>
 #include <qsm.h>

diff --git a/arch/m68k/generic/drivers/tpu_fqd.c b/arch/m68k/generic/drivers/tpu_fqd.c
index ed257cf5b7816ae2775a95340a7b90fbaf60f006..9c30013181eca9903f66ffa85302dc6f6ebc36cb 100644 (file)
--- a/arch/m68k/generic/drivers/tpu_fqd.c
+++ b/arch/m68k/generic/drivers/tpu_fqd.c
@@ -10,7 +10,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <sim.h>
 #include <tpu.h>

diff --git a/arch/m68k/generic/drivers/tpu_nitc.c b/arch/m68k/generic/drivers/tpu_nitc.c
index d17b215cffa3187c67330e1e3a2f49516bb8996a..4852e78dd524faca2328cac1916370d50c4ca2ce 100644 (file)
--- a/arch/m68k/generic/drivers/tpu_nitc.c
+++ b/arch/m68k/generic/drivers/tpu_nitc.c
@@ -10,7 +10,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <sim.h>
 #include <tpu.h>

diff --git a/arch/m68k/generic/drivers/tpu_qom.c b/arch/m68k/generic/drivers/tpu_qom.c
index 0ed45efd037d4cc8e6951a1b206bac6a4d53fdb2..e09b9129c838989f67e6d1b483473f59cbff330f 100644 (file)
--- a/arch/m68k/generic/drivers/tpu_qom.c
+++ b/arch/m68k/generic/drivers/tpu_qom.c
@@ -10,7 +10,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <sim.h>
 #include <tpu.h>

diff --git a/arch/m68k/generic/libs/misc/system_stub.c b/arch/m68k/generic/libs/misc/system_stub.c
index d81299f1bd11356aec0d2e56378dccf5ab0fd230..409087cb89c88abe7366ac5dcd0fe7b1e62e74b2 100644 (file)
--- a/arch/m68k/generic/libs/misc/system_stub.c
+++ b/arch/m68k/generic/libs/misc/system_stub.c
@@ -10,7 +10,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <sys/stat.h>
 #include <errno.h>

diff --git a/arch/m68k/generic/libs/misc/system_sup.c b/arch/m68k/generic/libs/misc/system_sup.c
index 5a08ef9f3d30fc0b6a253c8b4faf87b9f955c9e5..8c96b0ab35cb78511d2ad7776507cc91596bebd3 100644 (file)
--- a/arch/m68k/generic/libs/misc/system_sup.c
+++ b/arch/m68k/generic/libs/misc/system_sup.c
@@ -9,7 +9,7 @@
 
  *******************************************************************/
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <sim.h>
 #include <qsm.h>

diff --git a/arch/mcs51/mach-at89c51ed2/libs/flash/mcuflash.h b/arch/mcs51/mach-at89c51ed2/libs/flash/mcuflash.h
index b39b2918fbf9624453346ce90e0f982e301caaad..9009fb118d764251e9178ec6c81ef3d7f4072f99 100644 (file)
--- a/arch/mcs51/mach-at89c51ed2/libs/flash/mcuflash.h
+++ b/arch/mcs51/mach-at89c51ed2/libs/flash/mcuflash.h
@@ -5,7 +5,7 @@
 /*extern "C" {*/
 #endif
 
-#include <types.h>
+#include <stdint.h>
 
 int flash_erase(void *base,int size);
 int flash_copy(void *des,const void *src,int len);

diff --git a/arch/mcs51/mach-msc1210/libs/adc/msc_adc.h b/arch/mcs51/mach-msc1210/libs/adc/msc_adc.h
index ea9ced08b0fcc4a8b48340c8e802661cb99c8568..f72b7a633b3806c263447aa1ae782a091747e5b7 100644 (file)
--- a/arch/mcs51/mach-msc1210/libs/adc/msc_adc.h
+++ b/arch/mcs51/mach-msc1210/libs/adc/msc_adc.h
@@ -1,7 +1,7 @@
 #ifndef _MSC_ADC_H
 #define _MSC_ADC_H
 
-#include <types.h>
+#include <stdint.h>
 
 #define MSC_ADC_LSB_BIPOLAR 298.0232e-9
 #define MSC_ADC_LSB_UNIPOLAR 149.0116e-9

diff --git a/arch/mcs51/mach-msc1210/libs/flash/mcuflash.h b/arch/mcs51/mach-msc1210/libs/flash/mcuflash.h
index 67dc1a531074b064e62106563685cbe0639d6b73..7b126dfb2185d7ac8800087fb7a26b97babc8b49 100644 (file)
--- a/arch/mcs51/mach-msc1210/libs/flash/mcuflash.h
+++ b/arch/mcs51/mach-msc1210/libs/flash/mcuflash.h
@@ -5,7 +5,7 @@
 /*extern "C" {*/
 #endif
 
-#include <types.h>
+#include <stdint.h>
 
 #if !defined(SDCC_MODEL_LARGE) || !defined(SDCC)
   #define MSC_FNC_REENTRANT

diff --git a/arch/mcs51/mach-msc1210/libs/msc_loader.c b/arch/mcs51/mach-msc1210/libs/msc_loader.c
index 9262750c802ef7c12267fd1df52019795dfcf60b..ea8062331449ec6c7afec202f3e47f781f5bb95d 100644 (file)
--- a/arch/mcs51/mach-msc1210/libs/msc_loader.c
+++ b/arch/mcs51/mach-msc1210/libs/msc_loader.c
@@ -1,4 +1,4 @@
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/board/arm/lpc17xx-common/defines/system_def-lmc1.h b/board/arm/lpc17xx-common/defines/system_def-lmc1.h
index 87b819242816fa38be33a2c3e713eb234059fc76..0dbee3091fb3cf833f61636e738ed7c611cde573 100644 (file)
--- a/board/arm/lpc17xx-common/defines/system_def-lmc1.h
+++ b/board/arm/lpc17xx-common/defines/system_def-lmc1.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 #include <system_stub.h>
 #include <LPC17xx.h>
 #include <bspbase.h>

diff --git a/board/arm/lpc17xx-common/defines/system_def-mpx-uu-pc.h b/board/arm/lpc17xx-common/defines/system_def-mpx-uu-pc.h
index f39dc9fc364103059a7f6f8774df3826ae81fd37..600800ee354e9f5ede1a9e9ad1dcede1f4b7c2d9 100644 (file)
--- a/board/arm/lpc17xx-common/defines/system_def-mpx-uu-pc.h
+++ b/board/arm/lpc17xx-common/defines/system_def-mpx-uu-pc.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 #include <system_stub.h>
 #include <LPC17xx.h>
 #include <bspbase.h>

diff --git a/board/arm/lpc17xx-common/defines/system_def-ulmi.h b/board/arm/lpc17xx-common/defines/system_def-ulmi.h
index 6d40a9a1511d9bd7cdc2d172e0087911c5c41f30..8fb2c0d9238428ea5325bba943dab5bc157413bc 100644 (file)
--- a/board/arm/lpc17xx-common/defines/system_def-ulmi.h
+++ b/board/arm/lpc17xx-common/defines/system_def-ulmi.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 #include <system_stub.h>
 #include <LPC17xx.h>
 #include <bspbase.h>

diff --git a/board/arm/lpc17xx-common/libs/bspbase/bspbase.h b/board/arm/lpc17xx-common/libs/bspbase/bspbase.h
index 5369f81ee7e7d4aa2fb765c8a5eda336530f5cab..9f62c45b7a08e21345d6a9607fa9d4704733c4a3 100644 (file)
--- a/board/arm/lpc17xx-common/libs/bspbase/bspbase.h
+++ b/board/arm/lpc17xx-common/libs/bspbase/bspbase.h
@@ -1,7 +1,7 @@
 #ifndef _BSPBASE_H
 #define _BSPBASE_H
 
-#include <types.h>
+#include <stdint.h>
 #include <lt_timer_types.h>
 
 extern volatile lt_ticks_t sys_timer_ticks;

diff --git a/board/arm/ul_usb1/defines/system_def-ha-2x-relay-actuator.h b/board/arm/ul_usb1/defines/system_def-ha-2x-relay-actuator.h
index 7e5b14584a69cd84afb3b4f745a49ec6c3f9ed8b..cb2e3925f76103adf86c19d9f4fa3ba43551d1fd 100644 (file)
--- a/board/arm/ul_usb1/defines/system_def-ha-2x-relay-actuator.h
+++ b/board/arm/ul_usb1/defines/system_def-ha-2x-relay-actuator.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 #include <system_stub.h>
 #include <LPC210x.h>
 #include <bspbase.h>

diff --git a/board/arm/ul_usb1/defines/system_def-ha-switch.h b/board/arm/ul_usb1/defines/system_def-ha-switch.h
index 197c3227e3f14fbfe4c70d777615e55b42dbdc5f..8d0ae6556097cfec66f6dba23460cf6a903e4f6b 100644 (file)
--- a/board/arm/ul_usb1/defines/system_def-ha-switch.h
+++ b/board/arm/ul_usb1/defines/system_def-ha-switch.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 #include <system_stub.h>
 #include <LPC210x.h>
 #include <bspbase.h>

diff --git a/board/arm/ul_usb1/defines/system_def-hisc-garage-gate.h b/board/arm/ul_usb1/defines/system_def-hisc-garage-gate.h
index 506f7b77655e00eeee46a4f8d6af19e4a4f96c1a..7f0855ee3350729d83cc40d9c1c008be717c846e 100644 (file)
--- a/board/arm/ul_usb1/defines/system_def-hisc-garage-gate.h
+++ b/board/arm/ul_usb1/defines/system_def-hisc-garage-gate.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 #include <system_stub.h>
 #include <LPC214x.h>
 #include <bspbase.h>

diff --git a/board/arm/ul_usb1/defines/system_def-hisc-keypad.h b/board/arm/ul_usb1/defines/system_def-hisc-keypad.h
index 09a90c585ce328a7ad0be978125d1a66489385a1..b32f2aa7c25992513c52270dffbede820f2ea5b7 100644 (file)
--- a/board/arm/ul_usb1/defines/system_def-hisc-keypad.h
+++ b/board/arm/ul_usb1/defines/system_def-hisc-keypad.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 #include <system_stub.h>
 #include <LPC214x.h>
 #include <bspbase.h>

diff --git a/board/arm/ul_usb1/defines/system_def.h b/board/arm/ul_usb1/defines/system_def.h
index 6e7705199eaf5fac94062f283de7eecb281b8b0e..34692f8f43edb24d5ad4144697decc59d8ce65ec 100644 (file)
--- a/board/arm/ul_usb1/defines/system_def.h
+++ b/board/arm/ul_usb1/defines/system_def.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 #include <system_stub.h>
 #include <LPC214x.h>
 #include <bspbase.h>

diff --git a/board/arm/ul_usb1/libs/bspbase/bspbase.h b/board/arm/ul_usb1/libs/bspbase/bspbase.h
index 5369f81ee7e7d4aa2fb765c8a5eda336530f5cab..9f62c45b7a08e21345d6a9607fa9d4704733c4a3 100644 (file)
--- a/board/arm/ul_usb1/libs/bspbase/bspbase.h
+++ b/board/arm/ul_usb1/libs/bspbase/bspbase.h
@@ -1,7 +1,7 @@
 #ifndef _BSPBASE_H
 #define _BSPBASE_H
 
-#include <types.h>
+#include <stdint.h>
 #include <lt_timer_types.h>
 
 extern volatile lt_ticks_t sys_timer_ticks;

diff --git a/board/genposix/bspbase/bspbase.h b/board/genposix/bspbase/bspbase.h
index fabbb5b730b535c23a2c1df032f77aef5cf26b28..38d3e4b7d567d1d7190be25bc56e8bb680675486 100644 (file)
--- a/board/genposix/bspbase/bspbase.h
+++ b/board/genposix/bspbase/bspbase.h
@@ -1,7 +1,7 @@
 #ifndef _BSPBASE_H
 #define _BSPBASE_H
 
-#include <types.h>
+#include <stdint.h>
 #include <lt_timer_types.h>
 
 lt_ticks_t get_sys_timer_ticks(void);

diff --git a/board/genposix/bspbase/get_timer_ticks.c b/board/genposix/bspbase/get_timer_ticks.c
index db4a7a98288a725c174c2ae2ee14ef45da2500ca..9d2fbc4a7dca0a69fe93a173c260ddde614b0e93 100644 (file)
--- a/board/genposix/bspbase/get_timer_ticks.c
+++ b/board/genposix/bspbase/get_timer_ticks.c
@@ -1,4 +1,4 @@
-#include <types.h>
+#include <stdint.h>
 #include <lt_timer_types.h>
 #include <bspbase.h>
 #include <sys/time.h>

diff --git a/board/h8300/Makefile b/board/h8300/Makefile
new file mode 100644 (file)
index 0000000..76b56fd
--- /dev/null
+++ b/board/h8300/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or parent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/board/h8300/Makefile.omk b/board/h8300/Makefile.omk
new file mode 100644 (file)
index 0000000..2ca7db1
--- /dev/null
+++ b/board/h8300/Makefile.omk
@@ -0,0 +1,5 @@
+# -*- makefile -*-
+
+ifneq ($(wildcard $(SOURCES_DIR)/$(BOARD)),)
+SUBDIRS = $(BOARD)
+endif
\ No newline at end of file

diff --git a/board/h8300/edk2638/defines/system_def.h b/board/h8300/edk2638/defines/system_def.h
index 19ad2f37e43f51e7374739d638c96ec996be1956..ca20aca7dbb8886e26e18496bb5608e664af3ade 100644 (file)
--- a/board/h8300/edk2638/defines/system_def.h
+++ b/board/h8300/edk2638/defines/system_def.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 
 #define WITH_SFI_SEL
 

diff --git a/board/h8300/edk2638/defines/system_def_edk2638.h b/board/h8300/edk2638/defines/system_def_edk2638.h
index a90ff770cad36e766ceb3931a45c8b4fa6af103b..32dffffbdf0e5781c5272e75708a5aa6dc6127e5 100644 (file)
--- a/board/h8300/edk2638/defines/system_def_edk2638.h
+++ b/board/h8300/edk2638/defines/system_def_edk2638.h
@@ -29,7 +29,7 @@ volatile unsigned long msec_time;
 #define SCI_RS232_CHAN_DEFAULT 1
 
 /* XRAM 0.5 MB (CS0) */
-#define XRAM_START    (volatile __u8 * const)(0x040000)
+#define XRAM_START    (volatile uint8_t * const)(0x040000)
 
 #define XRAM_SUPPORT_ENABLED
 
@@ -38,9 +38,9 @@ volatile unsigned long msec_time;
 /* 0xffd000-0xffdfff .. 4 kB for Flash emulation */
 /* 0xffe000-0xffffc0 .. 4 kB - 64 B free*/
 /* 0xffffc0-0xffffff .. 64 B free*/
-#define IRAM_START    (volatile __u8 * const)(0xffb000)
-#define IRAM_START1   (volatile __u8 * const)(0xffe000)
-#define FRAM_START    (volatile __u8 * const)(0xffffc0)
+#define IRAM_START    (volatile uint8_t * const)(0xffb000)
+#define IRAM_START1   (volatile uint8_t * const)(0xffe000)
+#define FRAM_START    (volatile uint8_t * const)(0xffffc0)
 
 /* SCI0 - RS232 */
 /* SCI1 - RS232 / Boot */
@@ -69,10 +69,10 @@ volatile unsigned long msec_time;
 #define SHADOW_REG_WR(_reg,_val) \
     (*(_reg)=_reg##_shadow=(_val))
 
-__u8 DIO_P1DDR_shadow;
-__u8 DIO_P3DDR_shadow;
-__u8 DIO_PFDDR_shadow;
-__u8 DIO_PJDDR_shadow;
+uint8_t DIO_P1DDR_shadow;
+uint8_t DIO_P3DDR_shadow;
+uint8_t DIO_PFDDR_shadow;
+uint8_t DIO_PJDDR_shadow;
 
 #define DEB_LED_INIT() \
          do {\

diff --git a/board/h8300/edk2638/libs/bspbase/bsp0common.c b/board/h8300/edk2638/libs/bspbase/bsp0common.c
index b18ae5b083bfa9c4974f94fae60013a6db04d735..96b23b6b14be2093cc84519f942ff0ad6236b9d2 100644 (file)
--- a/board/h8300/edk2638/libs/bspbase/bsp0common.c
+++ b/board/h8300/edk2638/libs/bspbase/bsp0common.c
@@ -1,12 +1,12 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>
 
 #define SHADOW_SECT __attribute((section (".shadreg")))
 
-__u8 DIO_P1DDR_shadow SHADOW_SECT;
-__u8 DIO_P3DDR_shadow SHADOW_SECT;
-__u8 DIO_PFDDR_shadow SHADOW_SECT;
-__u8 DIO_PJDDR_shadow SHADOW_SECT;
+uint8_t DIO_P1DDR_shadow SHADOW_SECT;
+uint8_t DIO_P3DDR_shadow SHADOW_SECT;
+uint8_t DIO_PFDDR_shadow SHADOW_SECT;
+uint8_t DIO_PJDDR_shadow SHADOW_SECT;

diff --git a/board/h8300/edk2638/libs/bspbase/bsp0hwinit.c b/board/h8300/edk2638/libs/bspbase/bsp0hwinit.c
index 8f372e07f58d293cf16cf75f0ebf12f7bf1f8ca4..0ac84f2a2bfaf170ddf55594548835d9ee38f3e4 100644 (file)
--- a/board/h8300/edk2638/libs/bspbase/bsp0hwinit.c
+++ b/board/h8300/edk2638/libs/bspbase/bsp0hwinit.c
@@ -1,5 +1,5 @@
 /* procesor H8S/2638 board EDK2638 ver 1.1 */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/h8canusb/defines/system_def.h b/board/h8300/h8canusb/defines/system_def.h
index 0597dd6ec4e88b339ed4484b9acb9b5e46eb2eae..fd296434df6fadf1973539dac7086c8e8d03caee 100644 (file)
--- a/board/h8300/h8canusb/defines/system_def.h
+++ b/board/h8300/h8canusb/defines/system_def.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 
 #define WITH_SFI_SEL
 

diff --git a/board/h8300/h8canusb/defines/system_def_h8canusb.h b/board/h8300/h8canusb/defines/system_def_h8canusb.h
index d2baa8c2395fd3d34cf96b0b6ec15c0562b704e9..3c367a5da7c83a29b25436c8b494cbe803b29719 100644 (file)
--- a/board/h8300/h8canusb/defines/system_def_h8canusb.h
+++ b/board/h8300/h8canusb/defines/system_def_h8canusb.h
@@ -28,43 +28,43 @@ unsigned long cpu_sys_hz;   /* actual system clock frequency  */
 volatile unsigned long msec_time;
 
 /* Keyboard KL41 (CS3) */
-#define KL41_LCD_INST  (volatile __u8 * const)(0x700000)
-#define KL41_LCD_STAT  (volatile __u8 * const)(0x700001)
-#define KL41_LCD_WDATA (volatile __u8 * const)(0x700002)
-#define KL41_LCD_RDATA (volatile __u8 * const)(0x700003)
-#define KL41_LED_WR    (volatile __u8 * const)(0x700001)
-#define KL41_KBD_WR    (volatile __u8 * const)(0x700003)
-#define KL41_KBD_RD    (volatile __u8 * const)(0x700004)
+#define KL41_LCD_INST  (volatile uint8_t * const)(0x700000)
+#define KL41_LCD_STAT  (volatile uint8_t * const)(0x700001)
+#define KL41_LCD_WDATA (volatile uint8_t * const)(0x700002)
+#define KL41_LCD_RDATA (volatile uint8_t * const)(0x700003)
+#define KL41_LED_WR    (volatile uint8_t * const)(0x700001)
+#define KL41_KBD_WR    (volatile uint8_t * const)(0x700003)
+#define KL41_KBD_RD    (volatile uint8_t * const)(0x700004)
 
 #define KL41_SUPPORT_ENABLED
 
 
 
 /* SGM Small graphics LCD module 240x64 (CS3) */
-#define SGM_LCD_DATA   (volatile __u8 * const)(0x700000)
-#define SGM_LCD_CMD    (volatile __u8 * const)(0x700001)
-#define SGM_LCD_STAT   (volatile __u8 * const)(0x700001)
+#define SGM_LCD_DATA   (volatile uint8_t * const)(0x700000)
+#define SGM_LCD_CMD    (volatile uint8_t * const)(0x700001)
+#define SGM_LCD_STAT   (volatile uint8_t * const)(0x700001)
 /* Keyboard on MO_KBD1 */
-#define SGM_KBDI       (volatile __u8 * const)(0x700002)
-#define SGM_KBDO       (volatile __u8 * const)(0x700002)
+#define SGM_KBDI       (volatile uint8_t * const)(0x700002)
+#define SGM_KBDO       (volatile uint8_t * const)(0x700002)
 
 //#define SGM_SUPPORT_ENABLED
 
 /* XRAM 1 MB (CS1) */
-#define XRAM_START    (volatile __u8 * const)(0x200000)
+#define XRAM_START    (volatile uint8_t * const)(0x200000)
 
 #define XRAM_SUPPORT_ENABLED
 
 /* SRAM 32 kB (CS3) */
-//#define SRAM_START    (volatile __u8 * const)(0x610000)
+//#define SRAM_START    (volatile uint8_t * const)(0x610000)
 
 
 #if 1
 #define ISR_USB_INTV           EXCPTVEC_IRQ2   /* pin IRQ2 on PF.0 */
 #define PDIUSB_TEST_IRQ()      (!(*DIO_PORTF & 1))
-#define PDIUSB_READ_DATA_ADDR   (volatile __u8 * const)(0x500000)
-#define PDIUSB_WRITE_DATA_ADDR  (volatile __u8 * const)(0x500000)
-#define PDIUSB_COMMAND_ADDR     (volatile __u8 * const)(0x500001)
+#define PDIUSB_READ_DATA_ADDR   (volatile uint8_t * const)(0x500000)
+#define PDIUSB_WRITE_DATA_ADDR  (volatile uint8_t * const)(0x500000)
+#define PDIUSB_COMMAND_ADDR     (volatile uint8_t * const)(0x500001)
 
 /* P1.0 .. DACK_N/DMACK0, P7.0 .. DMREQ/DREQ0, P7.2 .. EOT_N/TEND0 */
 #undef  PDIUSB_WITH_ADD_IRQ_HANDLER
@@ -75,9 +75,9 @@ volatile unsigned long msec_time;
 
 
 /* IDE (CS4) (CS5) powered by PF2 */
-#define SIDE_START1   (volatile __u8 * const)(0x800000)
-#define SIDE_START2   (volatile __u8 * const)(0xA00000)
-#define IDE0_DATA     (volatile __u16 * const)(SIDE_START1+0) /* DATA */
+#define SIDE_START1   (volatile uint8_t * const)(0x800000)
+#define SIDE_START2   (volatile uint8_t * const)(0xA00000)
+#define IDE0_DATA     (volatile uint16_t * const)(SIDE_START1+0) /* DATA */
 #define IDE0_ERROR     (SIDE_START1+2) /* Error/Features RO/WO */
 #define IDE0_NSECTOR   (SIDE_START1+4) /* Sector Count R/W */
 #define IDE0_SECTOR    (SIDE_START1+6) /* SN, LBA 0-7 */
@@ -112,9 +112,9 @@ volatile unsigned long msec_time;
 /* 0xffd000-0xffdfff .. 4 kB for Flash emulation */
 /* 0xffe000-0xffffc0 .. 4 kB - 64 B free*/
 /* 0xffffc0-0xffffff .. 64 B free*/
-#define IRAM_START    (volatile __u8 * const)(0xffb000)
-#define IRAM_START1   (volatile __u8 * const)(0xffe000)
-#define FRAM_START    (volatile __u8 * const)(0xffffc0)
+#define IRAM_START    (volatile uint8_t * const)(0xffb000)
+#define IRAM_START1   (volatile uint8_t * const)(0xffe000)
+#define FRAM_START    (volatile uint8_t * const)(0xffffc0)
 
 /* SCI0 - IrDA */
 /* SCI1 - IIC0 (P34, P35) */
@@ -143,10 +143,10 @@ volatile unsigned long msec_time;
 #define SHADOW_REG_WR(_reg,_val) \
     (*(_reg)=_reg##_shadow=(_val))
 
-__u8 DIO_P1DDR_shadow;
-__u8 DIO_P3DDR_shadow;
-__u8 DIO_PFDDR_shadow;
-__u8 DIO_PJDDR_shadow;
+uint8_t DIO_P1DDR_shadow;
+uint8_t DIO_P3DDR_shadow;
+uint8_t DIO_PFDDR_shadow;
+uint8_t DIO_PJDDR_shadow;
 
 #define DEB_LED_INIT() \
        do {\

diff --git a/board/h8300/h8canusb/libs/bspbase/bsp0common.c b/board/h8300/h8canusb/libs/bspbase/bsp0common.c
index b18ae5b083bfa9c4974f94fae60013a6db04d735..96b23b6b14be2093cc84519f942ff0ad6236b9d2 100644 (file)
--- a/board/h8300/h8canusb/libs/bspbase/bsp0common.c
+++ b/board/h8300/h8canusb/libs/bspbase/bsp0common.c
@@ -1,12 +1,12 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>
 
 #define SHADOW_SECT __attribute((section (".shadreg")))
 
-__u8 DIO_P1DDR_shadow SHADOW_SECT;
-__u8 DIO_P3DDR_shadow SHADOW_SECT;
-__u8 DIO_PFDDR_shadow SHADOW_SECT;
-__u8 DIO_PJDDR_shadow SHADOW_SECT;
+uint8_t DIO_P1DDR_shadow SHADOW_SECT;
+uint8_t DIO_P3DDR_shadow SHADOW_SECT;
+uint8_t DIO_PFDDR_shadow SHADOW_SECT;
+uint8_t DIO_PJDDR_shadow SHADOW_SECT;

diff --git a/board/h8300/h8canusb/libs/bspbase/bsp0hwinit.c b/board/h8300/h8canusb/libs/bspbase/bsp0hwinit.c
index 1cb8668ca5ec777ab78edfbc8ec3490c20f10fb5..49d4f89140251a6d12af3ccf53f1cbdb5c8dcb23 100644 (file)
--- a/board/h8300/h8canusb/libs/bspbase/bsp0hwinit.c
+++ b/board/h8300/h8canusb/libs/bspbase/bsp0hwinit.c
@@ -1,5 +1,5 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/h8eurobot/defines/system_def.h b/board/h8300/h8eurobot/defines/system_def.h
index 5fef0e492ce13d3dd7f389650cbe16b2a2ea1ad9..a8a0a76460a6f6725acd40c0f17be28fc793eeb7 100644 (file)
--- a/board/h8300/h8eurobot/defines/system_def.h
+++ b/board/h8300/h8eurobot/defines/system_def.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 
 #define WITH_SFI_SEL
 

diff --git a/board/h8300/h8eurobot/defines/system_def_h8eurobot.h b/board/h8300/h8eurobot/defines/system_def_h8eurobot.h
index 88cf5b6242285a9e193fad668cb3e4302ea09fd1..b02a86e4750c1e333a52eeb25d88071715be1c5e 100644 (file)
--- a/board/h8300/h8eurobot/defines/system_def_h8eurobot.h
+++ b/board/h8300/h8eurobot/defines/system_def_h8eurobot.h
@@ -28,13 +28,13 @@ volatile unsigned long msec_time;
 
 /* Buffer stransferred to second board power control register */
 /* SRAM 32 kB (CS3) */
-//#define SRAM_START    (volatile __u8 * const)(0x610000)
+//#define SRAM_START    (volatile uint8_t * const)(0x610000)
 
 #if 0
 #define ISR_USB_INTV           EXCPTVEC_IRQ2   /* pin IRQ2 on PF.0 */
-#define PDIUSB_READ_DATA_ADDR   (volatile __u8 * const)(0x500000)
-#define PDIUSB_WRITE_DATA_ADDR  (volatile __u8 * const)(0x500000)
-#define PDIUSB_COMMAND_ADDR     (volatile __u8 * const)(0x500001)
+#define PDIUSB_READ_DATA_ADDR   (volatile uint8_t * const)(0x500000)
+#define PDIUSB_WRITE_DATA_ADDR  (volatile uint8_t * const)(0x500000)
+#define PDIUSB_COMMAND_ADDR     (volatile uint8_t * const)(0x500001)
 
 /* P1.0 .. DACK_N/DMACK0, P7.0 .. DMREQ/DREQ0, P7.2 .. EOT_N/TEND0 */
 #undef  PDIUSB_WITH_ADD_IRQ_HANDLER
@@ -45,9 +45,9 @@ volatile unsigned long msec_time;
 
 #if 0
 /* IDE (CS4) (CS5) powered by PF2 */
-#define SIDE_START1   (volatile __u8 * const)(0x800000)
-#define SIDE_START2   (volatile __u8 * const)(0xA00000)
-#define IDE0_DATA     (volatile __u16 * const)(SIDE_START1+0) /* DATA */
+#define SIDE_START1   (volatile uint8_t * const)(0x800000)
+#define SIDE_START2   (volatile uint8_t * const)(0xA00000)
+#define IDE0_DATA     (volatile uint16_t * const)(SIDE_START1+0) /* DATA */
 #define IDE0_ERROR     (SIDE_START1+2) /* Error/Features RO/WO */
 #define IDE0_NSECTOR   (SIDE_START1+4) /* Sector Count R/W */
 #define IDE0_SECTOR    (SIDE_START1+6) /* SN, LBA 0-7 */
@@ -82,9 +82,9 @@ volatile unsigned long msec_time;
 /* 0xffd000-0xffdfff .. 4 kB for Flash emulation */
 /* 0xffe000-0xffffc0 .. 4 kB - 64 B free*/
 /* 0xffffc0-0xffffff .. 64 B free*/
-#define IRAM_START    (volatile __u8 * const)(0xffb000)
-#define IRAM_START1   (volatile __u8 * const)(0xffe000)
-#define FRAM_START    (volatile __u8 * const)(0xffffc0)
+#define IRAM_START    (volatile uint8_t * const)(0xffb000)
+#define IRAM_START1   (volatile uint8_t * const)(0xffe000)
+#define FRAM_START    (volatile uint8_t * const)(0xffffc0)
 
 /* SCI0 - IrDA */
 /* SCI1 - IIC0 (P34, P35) */
@@ -113,12 +113,12 @@ volatile unsigned long msec_time;
 #define SHADOW_REG_WR(_reg,_val) \
     (*(_reg)=_reg##_shadow=(_val))
 
-__u8 DIO_P1DDR_shadow;
-__u8 DIO_P3DDR_shadow;
-__u8 DIO_PADDR_shadow;
-__u8 DIO_PEDDR_shadow;
-__u8 DIO_PFDDR_shadow;
-__u8 DIO_PJDDR_shadow;
+uint8_t DIO_P1DDR_shadow;
+uint8_t DIO_P3DDR_shadow;
+uint8_t DIO_PADDR_shadow;
+uint8_t DIO_PEDDR_shadow;
+uint8_t DIO_PFDDR_shadow;
+uint8_t DIO_PJDDR_shadow;
 
 #define DEB_LED_INIT() \
        do {\

diff --git a/board/h8300/h8eurobot/libs/bspbase/bsp0common.c b/board/h8300/h8eurobot/libs/bspbase/bsp0common.c
index 6ed0f6c85c2c3b4e50bf780b5f103ad4f54fd34e..cca850c42ba2fb0fe85f4226589b319373607e0e 100644 (file)
--- a/board/h8300/h8eurobot/libs/bspbase/bsp0common.c
+++ b/board/h8300/h8eurobot/libs/bspbase/bsp0common.c
@@ -1,13 +1,13 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>
 
 #define SHADOW_SECT __attribute((section (".shadreg")))
 
-__u8 DIO_P1DDR_shadow SHADOW_SECT;
-__u8 DIO_P3DDR_shadow SHADOW_SECT;
-__u8 DIO_PADDR_shadow SHADOW_SECT;
-__u8 DIO_PFDDR_shadow SHADOW_SECT;
-__u8 DIO_PJDDR_shadow SHADOW_SECT;
+uint8_t DIO_P1DDR_shadow SHADOW_SECT;
+uint8_t DIO_P3DDR_shadow SHADOW_SECT;
+uint8_t DIO_PADDR_shadow SHADOW_SECT;
+uint8_t DIO_PFDDR_shadow SHADOW_SECT;
+uint8_t DIO_PJDDR_shadow SHADOW_SECT;

diff --git a/board/h8300/h8eurobot/libs/bspbase/bsp0hwinit.c b/board/h8300/h8eurobot/libs/bspbase/bsp0hwinit.c
index 5e91e12f482b23150f8cafb3b7d645136f30aa1f..d1d98f34049ab887945b6ceed3fcb5932e4654ed 100644 (file)
--- a/board/h8300/h8eurobot/libs/bspbase/bsp0hwinit.c
+++ b/board/h8300/h8eurobot/libs/bspbase/bsp0hwinit.c
@@ -1,5 +1,5 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/h8heli/defines/system_def.h b/board/h8300/h8heli/defines/system_def.h
index b2810369f0665f33b0a30a1585c2c1decc5d2f68..2e6a2aa517e81b417482b7207fa0cc554dbb86d5 100644 (file)
--- a/board/h8300/h8heli/defines/system_def.h
+++ b/board/h8300/h8heli/defines/system_def.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 
 #define WITH_SFI_SEL
 
@@ -49,13 +49,13 @@ volatile unsigned long msec_time;
 
 /* Buffer stransferred to second board power control register */
 /* SRAM 32 kB (CS3) */
-//#define SRAM_START    (volatile __u8 * const)(0x610000)
+//#define SRAM_START    (volatile uint8_t * const)(0x610000)
 
 #if 0
 #define ISR_USB_INTV           EXCPTVEC_IRQ2   /* pin IRQ2 on PF.0 */
-#define PDIUSB_READ_DATA_ADDR   (volatile __u8 * const)(0x500000)
-#define PDIUSB_WRITE_DATA_ADDR  (volatile __u8 * const)(0x500000)
-#define PDIUSB_COMMAND_ADDR     (volatile __u8 * const)(0x500001)
+#define PDIUSB_READ_DATA_ADDR   (volatile uint8_t * const)(0x500000)
+#define PDIUSB_WRITE_DATA_ADDR  (volatile uint8_t * const)(0x500000)
+#define PDIUSB_COMMAND_ADDR     (volatile uint8_t * const)(0x500001)
 
 /* P1.0 .. DACK_N/DMACK0, P7.0 .. DMREQ/DREQ0, P7.2 .. EOT_N/TEND0 */
 #undef  PDIUSB_WITH_ADD_IRQ_HANDLER
@@ -66,9 +66,9 @@ volatile unsigned long msec_time;
 
 #if 0
 /* IDE (CS4) (CS5) powered by PF2 */
-#define SIDE_START1   (volatile __u8 * const)(0x800000)
-#define SIDE_START2   (volatile __u8 * const)(0xA00000)
-#define IDE0_DATA     (volatile __u16 * const)(SIDE_START1+0) /* DATA */
+#define SIDE_START1   (volatile uint8_t * const)(0x800000)
+#define SIDE_START2   (volatile uint8_t * const)(0xA00000)
+#define IDE0_DATA     (volatile uint16_t * const)(SIDE_START1+0) /* DATA */
 #define IDE0_ERROR     (SIDE_START1+2) /* Error/Features RO/WO */
 #define IDE0_NSECTOR   (SIDE_START1+4) /* Sector Count R/W */
 #define IDE0_SECTOR    (SIDE_START1+6) /* SN, LBA 0-7 */
@@ -103,9 +103,9 @@ volatile unsigned long msec_time;
 /* 0xffd000-0xffdfff .. 4 kB for Flash emulation */
 /* 0xffe000-0xffffc0 .. 4 kB - 64 B free*/
 /* 0xffffc0-0xffffff .. 64 B free*/
-#define IRAM_START    (volatile __u8 * const)(0xffb000)
-#define IRAM_START1   (volatile __u8 * const)(0xffe000)
-#define FRAM_START    (volatile __u8 * const)(0xffffc0)
+#define IRAM_START    (volatile uint8_t * const)(0xffb000)
+#define IRAM_START1   (volatile uint8_t * const)(0xffe000)
+#define FRAM_START    (volatile uint8_t * const)(0xffffc0)
 
 /* SCI0 - IrDA */
 /* SCI1 - IIC0 (P34, P35) */
@@ -134,12 +134,12 @@ volatile unsigned long msec_time;
 #define SHADOW_REG_WR(_reg,_val) \
     (*(_reg)=_reg##_shadow=(_val))
 
-extern __u8 DIO_P1DDR_shadow;
-extern __u8 DIO_P3DDR_shadow;
-extern __u8 DIO_PCDDR_shadow;
-extern __u8 DIO_PEDDR_shadow;
-extern __u8 DIO_PFDDR_shadow;
-extern __u8 DIO_PJDDR_shadow;
+extern uint8_t DIO_P1DDR_shadow;
+extern uint8_t DIO_P3DDR_shadow;
+extern uint8_t DIO_PCDDR_shadow;
+extern uint8_t DIO_PEDDR_shadow;
+extern uint8_t DIO_PFDDR_shadow;
+extern uint8_t DIO_PJDDR_shadow;
 
 #define DEB_LED_INIT() \
        do {\

diff --git a/board/h8300/h8heli/libs/bspbase/bsp0common.c b/board/h8300/h8heli/libs/bspbase/bsp0common.c
index c55607573d5c0e6440e62687c88d3787b99605d8..9fc58d80ae6ddc78daef6ef5345f09369ba26702 100644 (file)
--- a/board/h8300/h8heli/libs/bspbase/bsp0common.c
+++ b/board/h8300/h8heli/libs/bspbase/bsp0common.c
@@ -1,14 +1,14 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>
 
 #define SHADOW_SECT __attribute((section (".shadreg")))
 
-__u8 DIO_P1DDR_shadow SHADOW_SECT;
-__u8 DIO_P3DDR_shadow SHADOW_SECT;
-__u8 DIO_PCDDR_shadow SHADOW_SECT;
-__u8 DIO_PEDDR_shadow SHADOW_SECT;
-__u8 DIO_PFDDR_shadow SHADOW_SECT;
-__u8 DIO_PJDDR_shadow SHADOW_SECT;
+uint8_t DIO_P1DDR_shadow SHADOW_SECT;
+uint8_t DIO_P3DDR_shadow SHADOW_SECT;
+uint8_t DIO_PCDDR_shadow SHADOW_SECT;
+uint8_t DIO_PEDDR_shadow SHADOW_SECT;
+uint8_t DIO_PFDDR_shadow SHADOW_SECT;
+uint8_t DIO_PJDDR_shadow SHADOW_SECT;

diff --git a/board/h8300/h8heli/libs/bspbase/bsp0hwinit.c b/board/h8300/h8heli/libs/bspbase/bsp0hwinit.c
index eab6fb231bc021df9ef5009cf1c77b704a76ff9a..ed1f89d31a7ecd147e3e11e75ba8f5627c9829e9 100644 (file)
--- a/board/h8300/h8heli/libs/bspbase/bsp0hwinit.c
+++ b/board/h8300/h8heli/libs/bspbase/bsp0hwinit.c
@@ -1,5 +1,5 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/h8heli/servodrv/mycan.c b/board/h8300/h8heli/servodrv/mycan.c
index c55a1d5b8342e024cb7d1a339233d4b28c4253b2..7abe6f6b73c3e2fb27d916415b5c001473e78b03 100644 (file)
--- a/board/h8300/h8heli/servodrv/mycan.c
+++ b/board/h8300/h8heli/servodrv/mycan.c
@@ -1,7 +1,7 @@
 /* H8HELI  CAN DRIVER  *
  * Ota Herm, 2005      */
 #include <stdio.h>
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/h8heli/servodrv/mycan_old.c b/board/h8300/h8heli/servodrv/mycan_old.c
index 5d52ae6067466756ae59f3d04dd74d32e5c8e3d2..3318d2fd8ae2aa0fa18f1724222a186198472678 100644 (file)
--- a/board/h8300/h8heli/servodrv/mycan_old.c
+++ b/board/h8300/h8heli/servodrv/mycan_old.c
@@ -1,7 +1,7 @@
 /* H8HELI  CAN DRIVER  *
  * Ota Herm, 2005      */
 #include <stdio.h>
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/h8heli/servodrv/servodrv.c b/board/h8300/h8heli/servodrv/servodrv.c
index 47c73f8a6d7dd4f8656ee70d74b68ab11ea80dcc..c7b1a660b7361d9e11759190d4174be745dafb28 100644 (file)
--- a/board/h8300/h8heli/servodrv/servodrv.c
+++ b/board/h8300/h8heli/servodrv/servodrv.c
@@ -1,6 +1,6 @@
 /* procesor H8S/2638 ver 1.1  */
 #include <stdio.h>
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/h8heli/servodrv/servoout.c b/board/h8300/h8heli/servodrv/servoout.c
index f3c56fe9fc35332db4095534cbd9e6d2fb9da25c..c0b5e3d5aac0d7f0266236537007772ef36de0c6 100644 (file)
--- a/board/h8300/h8heli/servodrv/servoout.c
+++ b/board/h8300/h8heli/servodrv/servoout.c
@@ -2,7 +2,7 @@
  * Ota Herm, 2005                              */
 
 #include <stdio.h>
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/h8mirosot/defines/system_def.h b/board/h8300/h8mirosot/defines/system_def.h
index a1726a43f3991a3b8cd6b29565d03752cada9b74..59921af135e1ece21e47228eca5f2388d8c714ef 100644 (file)
--- a/board/h8300/h8mirosot/defines/system_def.h
+++ b/board/h8300/h8mirosot/defines/system_def.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 
 #define WITH_SFI_SEL
 

diff --git a/board/h8300/h8mirosot/defines/system_def_h8mirosot.h b/board/h8300/h8mirosot/defines/system_def_h8mirosot.h
index 2ea1fa8d19df279e5e9e97de573983d3867dc683..c1df4e18784d2bc1671e5eeb7b2269d7d4a2598d 100644 (file)
--- a/board/h8300/h8mirosot/defines/system_def_h8mirosot.h
+++ b/board/h8300/h8mirosot/defines/system_def_h8mirosot.h
@@ -23,13 +23,13 @@ volatile unsigned long msec_time;
 
 /* Buffer stransferred to second board power control register */
 /* SRAM 32 kB (CS3) */
-//#define SRAM_START    (volatile __u8 * const)(0x610000)
+//#define SRAM_START    (volatile uint8_t * const)(0x610000)
 
 #if 0
 #define ISR_USB_INTV           EXCPTVEC_IRQ2   /* pin IRQ2 on PF.0 */
-#define PDIUSB_READ_DATA_ADDR   (volatile __u8 * const)(0x500000)
-#define PDIUSB_WRITE_DATA_ADDR  (volatile __u8 * const)(0x500000)
-#define PDIUSB_COMMAND_ADDR     (volatile __u8 * const)(0x500001)
+#define PDIUSB_READ_DATA_ADDR   (volatile uint8_t * const)(0x500000)
+#define PDIUSB_WRITE_DATA_ADDR  (volatile uint8_t * const)(0x500000)
+#define PDIUSB_COMMAND_ADDR     (volatile uint8_t * const)(0x500001)
 
 /* P1.0 .. DACK_N/DMACK0, P7.0 .. DMREQ/DREQ0, P7.2 .. EOT_N/TEND0 */
 #undef  PDIUSB_WITH_ADD_IRQ_HANDLER
@@ -40,9 +40,9 @@ volatile unsigned long msec_time;
 
 #if 0
 /* IDE (CS4) (CS5) powered by PF2 */
-#define SIDE_START1   (volatile __u8 * const)(0x800000)
-#define SIDE_START2   (volatile __u8 * const)(0xA00000)
-#define IDE0_DATA     (volatile __u16 * const)(SIDE_START1+0) /* DATA */
+#define SIDE_START1   (volatile uint8_t * const)(0x800000)
+#define SIDE_START2   (volatile uint8_t * const)(0xA00000)
+#define IDE0_DATA     (volatile uint16_t * const)(SIDE_START1+0) /* DATA */
 #define IDE0_ERROR     (SIDE_START1+2) /* Error/Features RO/WO */
 #define IDE0_NSECTOR   (SIDE_START1+4) /* Sector Count R/W */
 #define IDE0_SECTOR    (SIDE_START1+6) /* SN, LBA 0-7 */
@@ -77,9 +77,9 @@ volatile unsigned long msec_time;
 /* 0xffd000-0xffdfff .. 4 kB for Flash emulation */
 /* 0xffe000-0xffffc0 .. 4 kB - 64 B free*/
 /* 0xffffc0-0xffffff .. 64 B free*/
-#define IRAM_START    (volatile __u8 * const)(0xffb000)
-#define IRAM_START1   (volatile __u8 * const)(0xffe000)
-#define FRAM_START    (volatile __u8 * const)(0xffffc0)
+#define IRAM_START    (volatile uint8_t * const)(0xffb000)
+#define IRAM_START1   (volatile uint8_t * const)(0xffe000)
+#define FRAM_START    (volatile uint8_t * const)(0xffffc0)
 
 /* SCI0 - IrDA */
 /* SCI1 - IIC0 (P34, P35) */
@@ -108,11 +108,11 @@ volatile unsigned long msec_time;
 #define SHADOW_REG_WR(_reg,_val) \
     (*(_reg)=_reg##_shadow=(_val))
 
-__u8 DIO_P1DDR_shadow;
-__u8 DIO_P3DDR_shadow;
-__u8 DIO_PEDDR_shadow;
-__u8 DIO_PFDDR_shadow;
-__u8 DIO_PJDDR_shadow;
+uint8_t DIO_P1DDR_shadow;
+uint8_t DIO_P3DDR_shadow;
+uint8_t DIO_PEDDR_shadow;
+uint8_t DIO_PFDDR_shadow;
+uint8_t DIO_PJDDR_shadow;
 
 #define DEB_LED_INIT() \
        do {\

diff --git a/board/h8300/h8mirosot/libs/bspbase/bsp0common.c b/board/h8300/h8mirosot/libs/bspbase/bsp0common.c
index b18ae5b083bfa9c4974f94fae60013a6db04d735..96b23b6b14be2093cc84519f942ff0ad6236b9d2 100644 (file)
--- a/board/h8300/h8mirosot/libs/bspbase/bsp0common.c
+++ b/board/h8300/h8mirosot/libs/bspbase/bsp0common.c
@@ -1,12 +1,12 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>
 
 #define SHADOW_SECT __attribute((section (".shadreg")))
 
-__u8 DIO_P1DDR_shadow SHADOW_SECT;
-__u8 DIO_P3DDR_shadow SHADOW_SECT;
-__u8 DIO_PFDDR_shadow SHADOW_SECT;
-__u8 DIO_PJDDR_shadow SHADOW_SECT;
+uint8_t DIO_P1DDR_shadow SHADOW_SECT;
+uint8_t DIO_P3DDR_shadow SHADOW_SECT;
+uint8_t DIO_PFDDR_shadow SHADOW_SECT;
+uint8_t DIO_PJDDR_shadow SHADOW_SECT;

diff --git a/board/h8300/h8mirosot/libs/bspbase/bsp0hwinit.c b/board/h8300/h8mirosot/libs/bspbase/bsp0hwinit.c
index 8163124fecc0b1c304817e1906b6e36f20d9412c..d12bbe34450e765f20c54348d9f729c200467a75 100644 (file)
--- a/board/h8300/h8mirosot/libs/bspbase/bsp0hwinit.c
+++ b/board/h8300/h8mirosot/libs/bspbase/bsp0hwinit.c
@@ -1,5 +1,5 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/hi_cpu2/defines/system_def.h b/board/h8300/hi_cpu2/defines/system_def.h
index ac7ee1821305c6e86043257da880963de3018cfa..553285ac6f8c3c75cc4d996208a9434c8e4f186b 100644 (file)
--- a/board/h8300/hi_cpu2/defines/system_def.h
+++ b/board/h8300/hi_cpu2/defines/system_def.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 
 #define WITH_SFI_SEL
 

diff --git a/board/h8300/hi_cpu2/defines/system_def_hi_cpu2.h b/board/h8300/hi_cpu2/defines/system_def_hi_cpu2.h
index 47de8161375640ad90a61f85e2cff14278ff84a7..b9ae239b547f6de5ebecfe8b6080a713a4697f43 100644 (file)
--- a/board/h8300/hi_cpu2/defines/system_def_hi_cpu2.h
+++ b/board/h8300/hi_cpu2/defines/system_def_hi_cpu2.h
@@ -30,45 +30,45 @@ volatile unsigned long msec_time;
 #define SCI_RS232_CHAN_DEFAULT 1
 
 /* Keyboard KL41 (CS3) */
-#define KL41_LCD_INST  (volatile __u8 * const)(0x700000)
-#define KL41_LCD_STAT  (volatile __u8 * const)(0x700001)
-#define KL41_LCD_WDATA (volatile __u8 * const)(0x700002)
-#define KL41_LCD_RDATA (volatile __u8 * const)(0x700003)
-#define KL41_LED_WR    (volatile __u8 * const)(0x700001)
-#define KL41_KBD_WR    (volatile __u8 * const)(0x700003)
-#define KL41_KBD_RD    (volatile __u8 * const)(0x700004)
+#define KL41_LCD_INST  (volatile uint8_t * const)(0x700000)
+#define KL41_LCD_STAT  (volatile uint8_t * const)(0x700001)
+#define KL41_LCD_WDATA (volatile uint8_t * const)(0x700002)
+#define KL41_LCD_RDATA (volatile uint8_t * const)(0x700003)
+#define KL41_LED_WR    (volatile uint8_t * const)(0x700001)
+#define KL41_KBD_WR    (volatile uint8_t * const)(0x700003)
+#define KL41_KBD_RD    (volatile uint8_t * const)(0x700004)
 
 #define KL41_SUPPORT_ENABLED
 
 
 
 /* SGM Small graphics LCD module 240x64 (CS3) */
-#define SGM_LCD_DATA   (volatile __u8 * const)(0x700000)
-#define SGM_LCD_CMD    (volatile __u8 * const)(0x700001)
-#define SGM_LCD_STAT   (volatile __u8 * const)(0x700001)
+#define SGM_LCD_DATA   (volatile uint8_t * const)(0x700000)
+#define SGM_LCD_CMD    (volatile uint8_t * const)(0x700001)
+#define SGM_LCD_STAT   (volatile uint8_t * const)(0x700001)
 /* Keyboard on MO_KBD1 */
-#define SGM_KBDI       (volatile __u8 * const)(0x700002)
-#define SGM_KBDO       (volatile __u8 * const)(0x700002)
+#define SGM_KBDI       (volatile uint8_t * const)(0x700002)
+#define SGM_KBDO       (volatile uint8_t * const)(0x700002)
 
 //#define SGM_SUPPORT_ENABLED
 
 /* XRAM 1 MB (CS2) */
-#define XRAM_START    (volatile __u8 * const)(0x500000)
+#define XRAM_START    (volatile uint8_t * const)(0x500000)
 
 #define XRAM_SUPPORT_ENABLED
 
 /* SRAM 32 kB (CSx) */
-//#define SRAM_START    (volatile __u8 * const)(0x610000)
+//#define SRAM_START    (volatile uint8_t * const)(0x610000)
 
 /* AUXPORT (CS1) */
-#define AUXPORT_START   (volatile __u8 * const)(0x200000)
+#define AUXPORT_START   (volatile uint8_t * const)(0x200000)
 
 #if 0
 #define ISR_USB_INTV           EXCPTVEC_IRQ2   /* pin IRQ2 on PF.0 */
 #define PDIUSB_TEST_IRQ()      (!(*DIO_PORTF & 1))
-#define PDIUSB_READ_DATA_ADDR   (volatile __u8 * const)(0x500000)
-#define PDIUSB_WRITE_DATA_ADDR  (volatile __u8 * const)(0x500000)
-#define PDIUSB_COMMAND_ADDR     (volatile __u8 * const)(0x500001)
+#define PDIUSB_READ_DATA_ADDR   (volatile uint8_t * const)(0x500000)
+#define PDIUSB_WRITE_DATA_ADDR  (volatile uint8_t * const)(0x500000)
+#define PDIUSB_COMMAND_ADDR     (volatile uint8_t * const)(0x500001)
 
 /* P1.0 .. DACK_N/DMACK0, P7.0 .. DMREQ/DREQ0, P7.2 .. EOT_N/TEND0 */
 #undef  PDIUSB_WITH_ADD_IRQ_HANDLER
@@ -79,9 +79,9 @@ volatile unsigned long msec_time;
 
 
 /* IDE (CS4) (CS5) powered by PF2 */
-#define SIDE_START1   (volatile __u8 * const)(0x800000)
-#define SIDE_START2   (volatile __u8 * const)(0xA00000)
-#define IDE0_DATA     (volatile __u16 * const)(SIDE_START1+0) /* DATA */
+#define SIDE_START1   (volatile uint8_t * const)(0x800000)
+#define SIDE_START2   (volatile uint8_t * const)(0xA00000)
+#define IDE0_DATA     (volatile uint16_t * const)(SIDE_START1+0) /* DATA */
 #define IDE0_ERROR     (SIDE_START1+2) /* Error/Features RO/WO */
 #define IDE0_NSECTOR   (SIDE_START1+4) /* Sector Count R/W */
 #define IDE0_SECTOR    (SIDE_START1+6) /* SN, LBA 0-7 */
@@ -116,9 +116,9 @@ volatile unsigned long msec_time;
 /* 0xffd000-0xffdfff .. 4 kB for Flash emulation */
 /* 0xffe000-0xffffc0 .. 4 kB - 64 B free*/
 /* 0xffffc0-0xffffff .. 64 B free*/
-#define IRAM_START    (volatile __u8 * const)(0xffb000)
-#define IRAM_START1   (volatile __u8 * const)(0xffe000)
-#define FRAM_START    (volatile __u8 * const)(0xffffc0)
+#define IRAM_START    (volatile uint8_t * const)(0xffb000)
+#define IRAM_START1   (volatile uint8_t * const)(0xffe000)
+#define FRAM_START    (volatile uint8_t * const)(0xffffc0)
 
 /* SCI0 - IrDA */
 /* SCI1 - IIC0 (P34, P35) */
@@ -147,10 +147,10 @@ volatile unsigned long msec_time;
 #define SHADOW_REG_WR(_reg,_val) \
     (*(_reg)=_reg##_shadow=(_val))
 
-__u8 DIO_P1DDR_shadow;
-__u8 DIO_P3DDR_shadow;
-__u8 DIO_PFDDR_shadow;
-__u8 DIO_PJDDR_shadow;
+uint8_t DIO_P1DDR_shadow;
+uint8_t DIO_P3DDR_shadow;
+uint8_t DIO_PFDDR_shadow;
+uint8_t DIO_PJDDR_shadow;
 
 #define DEB_LED_INIT() \
        do {\

diff --git a/board/h8300/hi_cpu2/libs/bspbase/bsp0common.c b/board/h8300/hi_cpu2/libs/bspbase/bsp0common.c
index b18ae5b083bfa9c4974f94fae60013a6db04d735..96b23b6b14be2093cc84519f942ff0ad6236b9d2 100644 (file)
--- a/board/h8300/hi_cpu2/libs/bspbase/bsp0common.c
+++ b/board/h8300/hi_cpu2/libs/bspbase/bsp0common.c
@@ -1,12 +1,12 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>
 
 #define SHADOW_SECT __attribute((section (".shadreg")))
 
-__u8 DIO_P1DDR_shadow SHADOW_SECT;
-__u8 DIO_P3DDR_shadow SHADOW_SECT;
-__u8 DIO_PFDDR_shadow SHADOW_SECT;
-__u8 DIO_PJDDR_shadow SHADOW_SECT;
+uint8_t DIO_P1DDR_shadow SHADOW_SECT;
+uint8_t DIO_P3DDR_shadow SHADOW_SECT;
+uint8_t DIO_PFDDR_shadow SHADOW_SECT;
+uint8_t DIO_PJDDR_shadow SHADOW_SECT;

diff --git a/board/h8300/hi_cpu2/libs/bspbase/bsp0hwinit.c b/board/h8300/hi_cpu2/libs/bspbase/bsp0hwinit.c
index 5c13cede5a1e09170a38af3abd59721162aef025..ffc0694da20aae9ad26d7bbeb4b93cc85ab25dc1 100644 (file)
--- a/board/h8300/hi_cpu2/libs/bspbase/bsp0hwinit.c
+++ b/board/h8300/hi_cpu2/libs/bspbase/bsp0hwinit.c
@@ -1,5 +1,5 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2638h.h>
 #include <system_def.h>

diff --git a/board/h8300/jt_usb1/defines/system_def.h b/board/h8300/jt_usb1/defines/system_def.h
index 2c26e87991a28872f53400d0e28c1ba5716c554c..7e1d8d247d6bd3d502ea020982adddc8c283344e 100644 (file)
--- a/board/h8300/jt_usb1/defines/system_def.h
+++ b/board/h8300/jt_usb1/defines/system_def.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 
 #define WITH_SFI_SEL
 

diff --git a/board/h8300/jt_usb1/defines/system_def_jt_usb1.h b/board/h8300/jt_usb1/defines/system_def_jt_usb1.h
index d433eec54c96c1756f0c082b5e7fa7ab5111ca61..587c2358f2041596e1c7fa3a56b33222ac2dbf50 100644 (file)
--- a/board/h8300/jt_usb1/defines/system_def_jt_usb1.h
+++ b/board/h8300/jt_usb1/defines/system_def_jt_usb1.h
@@ -34,9 +34,9 @@ volatile unsigned long msec_time;
 #if 1
 #define ISR_USB_INTV           EXCPTVEC_IRQ6   /* pin IRQ6 on PG.0 */
 #define PDIUSB_TEST_IRQ()      (!(*DIO_PORTG & 1))
-#define PDIUSB_READ_DATA_ADDR   (volatile __u8 * const)(0x600000)
-#define PDIUSB_WRITE_DATA_ADDR  (volatile __u8 * const)(0x600000)
-#define PDIUSB_COMMAND_ADDR     (volatile __u8 * const)(0x600001)
+#define PDIUSB_READ_DATA_ADDR   (volatile uint8_t * const)(0x600000)
+#define PDIUSB_WRITE_DATA_ADDR  (volatile uint8_t * const)(0x600000)
+#define PDIUSB_COMMAND_ADDR     (volatile uint8_t * const)(0x600001)
 
 /* P1.0 .. DACK_N/DMACK0, P7.0 .. DMREQ/DREQ0, P7.2 .. EOT_N/TEND0 */
 #undef  PDIUSB_WITH_ADD_IRQ_HANDLER
@@ -49,9 +49,9 @@ volatile unsigned long msec_time;
 /* 0xffd000-0xffdfff .. 4 kB for Flash emulation */
 /* 0xffe000-0xffffc0 .. 4 kB - 64 B free*/
 /* 0xffffc0-0xffffff .. 64 B free*/
-#define IRAM_START    (volatile __u8 * const)(0xffb000)
-#define IRAM_START1   (volatile __u8 * const)(0xffe000)
-#define FRAM_START    (volatile __u8 * const)(0xffffc0)
+#define IRAM_START    (volatile uint8_t * const)(0xffb000)
+#define IRAM_START1   (volatile uint8_t * const)(0xffe000)
+#define FRAM_START    (volatile uint8_t * const)(0xffffc0)
 
 /* SCI0 - RS232/485 */
 /* SCI1 - x */
@@ -78,11 +78,11 @@ volatile unsigned long msec_time;
 #define SHADOW_REG_WR(_reg,_val) \
     (*(_reg)=_reg##_shadow=(_val))
 
-__u8 DIO_P1DDR_shadow;
-__u8 DIO_P3DDR_shadow;
-__u8 DIO_P7DDR_shadow;
-__u8 DIO_PFDDR_shadow;
-__u8 DIO_PGDDR_shadow;
+uint8_t DIO_P1DDR_shadow;
+uint8_t DIO_P3DDR_shadow;
+uint8_t DIO_P7DDR_shadow;
+uint8_t DIO_PFDDR_shadow;
+uint8_t DIO_PGDDR_shadow;
 
 #define DEB_LED_INIT() \
        do { /* set P3.2, P3.6, P3.7 LED output */ \

diff --git a/board/h8300/jt_usb1/libs/bspbase/bsp0common.c b/board/h8300/jt_usb1/libs/bspbase/bsp0common.c
index f852879528c1062c8225ea1421a14b115fc3a117..ab74a6be6fc0d8796aea45a120cfce25d83be14a 100644 (file)
--- a/board/h8300/jt_usb1/libs/bspbase/bsp0common.c
+++ b/board/h8300/jt_usb1/libs/bspbase/bsp0common.c
@@ -1,12 +1,12 @@
 /* procesor H8S/2633 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2633h.h>
 #include <system_def.h>
 
 #define SHADOW_SECT __attribute((section (".shadreg")))
 
-__u8 DIO_P1DDR_shadow SHADOW_SECT;
-__u8 DIO_P3DDR_shadow SHADOW_SECT;
-__u8 DIO_PFDDR_shadow SHADOW_SECT;
-__u8 DIO_PJDDR_shadow SHADOW_SECT;
+uint8_t DIO_P1DDR_shadow SHADOW_SECT;
+uint8_t DIO_P3DDR_shadow SHADOW_SECT;
+uint8_t DIO_PFDDR_shadow SHADOW_SECT;
+uint8_t DIO_PJDDR_shadow SHADOW_SECT;

diff --git a/board/h8300/jt_usb1/libs/bspbase/bsp0hwinit.c b/board/h8300/jt_usb1/libs/bspbase/bsp0hwinit.c
index 7f313fc0a2e2a072c7479d87855c7fa7656139d7..060cfeec15a1a4f64c95c2c3fbab9fb69daaf94a 100644 (file)
--- a/board/h8300/jt_usb1/libs/bspbase/bsp0hwinit.c
+++ b/board/h8300/jt_usb1/libs/bspbase/bsp0hwinit.c
@@ -1,5 +1,5 @@
 /* procesor H8S/2638 ver 1.1  */
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 #include <h8s2633h.h>
 #include <system_def.h>

diff --git a/board/m68k/mo_cpu1/defines/system_def.h b/board/m68k/mo_cpu1/defines/system_def.h
index 81853c92f9cd6d7f0fc00e6c14e52f88ee78494b..998cd81fe5cc7fa40eafd413344cfb6f80d5785d 100644 (file)
--- a/board/m68k/mo_cpu1/defines/system_def.h
+++ b/board/m68k/mo_cpu1/defines/system_def.h
@@ -20,7 +20,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 
 #define VER_CODE(major,minor,patch) (major*0x10000+minor*0x100+patch)
 /* Software version */

diff --git a/board/mcs51/hisc/libs/bspbase/bspbase.h b/board/mcs51/hisc/libs/bspbase/bspbase.h
index 74e9bf3516da7b28acd62ab2e139806433245f73..ab9deee838c79a87f81774411f0ea5734c7045b8 100644 (file)
--- a/board/mcs51/hisc/libs/bspbase/bspbase.h
+++ b/board/mcs51/hisc/libs/bspbase/bspbase.h
@@ -1,7 +1,7 @@
 #ifndef _BSPBASE_H
 #define _BSPBASE_H
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <cpu_def.h>
 #include <lt_timer_types.h>

diff --git a/board/mcs51/ps1/libs/bspbase/bspbase.h b/board/mcs51/ps1/libs/bspbase/bspbase.h
index eef520ffa90052d315b8498197d219c99003b1ba..99fa3e02daba32af33115d5aeee42d418820384f 100644 (file)
--- a/board/mcs51/ps1/libs/bspbase/bspbase.h
+++ b/board/mcs51/ps1/libs/bspbase/bspbase.h
@@ -1,7 +1,7 @@
 #ifndef _BSPBASE_H
 #define _BSPBASE_H
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <cpu_def.h>
 #include <lt_timer_types.h>

diff --git a/board/mcs51/ulad21/libs/bspbase/bspbase.h b/board/mcs51/ulad21/libs/bspbase/bspbase.h
index eef520ffa90052d315b8498197d219c99003b1ba..99fa3e02daba32af33115d5aeee42d418820384f 100644 (file)
--- a/board/mcs51/ulad21/libs/bspbase/bspbase.h
+++ b/board/mcs51/ulad21/libs/bspbase/bspbase.h
@@ -1,7 +1,7 @@
 #ifndef _BSPBASE_H
 #define _BSPBASE_H
 
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <cpu_def.h>
 #include <lt_timer_types.h>

diff --git a/board/mcs51/ulad21/system_def.h b/board/mcs51/ulad21/system_def.h
index aef9ba6ef1915f35d70e751e03f951bb65170feb..6d5951e4031d0699938ca77469ef901f755742b5 100644 (file)
--- a/board/mcs51/ulad21/system_def.h
+++ b/board/mcs51/ulad21/system_def.h
@@ -14,7 +14,7 @@
 #ifndef _SYSTEM_DEF_H_
 #define _SYSTEM_DEF_H_
 
-#include <types.h>
+#include <stdint.h>
 
 #define WITH_SFI_SEL
 

diff --git a/board/mcs51/ulad21/system_def_msc51_uc1.h b/board/mcs51/ulad21/system_def_msc51_uc1.h
index e795169a0298f93a48a9bdf153670345e6cdd496..12ab9927aed5a368ce69d8e721a7639cd424df18 100644 (file)
--- a/board/mcs51/ulad21/system_def_msc51_uc1.h
+++ b/board/mcs51/ulad21/system_def_msc51_uc1.h
@@ -87,9 +87,9 @@
 /* 0xffe000-0xffffc0 .. 4 kB - 64 B free*/
 /* 0xffffc0-0xffffff .. 64 B free*/
 /*
-#define IRAM_START    (volatile __u8 * const)(0xffb000)
-#define IRAM_START1   (volatile __u8 * const)(0xffe000)
-#define FRAM_START    (volatile __u8 * const)(0xffffc0)
+#define IRAM_START    (volatile uint8_t * const)(0xffb000)
+#define IRAM_START1   (volatile uint8_t * const)(0xffe000)
+#define FRAM_START    (volatile uint8_t * const)(0xffffc0)
 */
 
 #define KVPB_MINIMALIZED

diff --git a/libs4c/i2c/i2c_drv.h b/libs4c/i2c/i2c_drv.h
index f1cca85d1382839dab476ffcf857b88208501e74..82eb84fe0e22538e03446c30228247524b36e8c0 100644 (file)
--- a/libs4c/i2c/i2c_drv.h
+++ b/libs4c/i2c/i2c_drv.h
@@ -24,7 +24,7 @@
 #ifndef _I2C_DRV_H_
 #define _I2C_DRV_H_
 
-#include <types.h>
+#include <stdint.h>
 #include <cpu_def.h>
 
 #if defined(CONFIG_OC_I2C_DRV_SYSLESS)

diff --git a/libs4c/keyval/keyvalpb.h b/libs4c/keyval/keyvalpb.h
index 210a02b3c2ef20786cfe9b1a77f96d7534381682..9df143544f4383008ad7384ac5fd1a5524220141 100644 (file)
--- a/libs4c/keyval/keyvalpb.h
+++ b/libs4c/keyval/keyvalpb.h
@@ -26,7 +26,7 @@
 #define _KEYVALPB_H_
 
 //#include <inttypes.h>
-#include <types.h>
+#include <stdint.h>
 #include <system_def.h>
 #include <cpu_def.h>
 

diff --git a/libs4c/usb/base/usb/usb_spec.h b/libs4c/usb/base/usb/usb_spec.h
index a5f0b80cc1837c71ef7b838fbaf87c224bd31013..68125db4556de376e15ec71d08434c389b1566f0 100644 (file)
--- a/libs4c/usb/base/usb/usb_spec.h
+++ b/libs4c/usb/base/usb/usb_spec.h
@@ -8,7 +8,7 @@
  #define _USB_SPECIFICATIONS_AND_DEFINITIONS_MODULE
 
 /*#include <inttypes.h>*/
-#include <types.h>
+#include <stdint.h>
 
 #ifndef PACKED
   #ifdef  __GNUC__