Browse Source

del u64 typedef, has been defined sys/linux/types.h.

Change-Id: I9c32efee30a4a95adcff4dff316dca81de13f5fd
Signed-off-by: Chong Qiao <qiaochong@loongson.cn>
master
Chong Qiao 4 years ago
parent
commit
df3068d31e
  1. 1
      Targets/Bonito3a3000_7a/pci/ls7a_pci.c
  2. 2
      Targets/Bonito3a4000_7a/Bonito/tgt_machdep.c
  3. 1
      Targets/Bonito3a780e/pci/rs780_cmn.c
  4. 1
      Targets/Bonito3a82w/pci/rs780_cmn.c
  5. 1
      Targets/Bonito3a84w/pci/rs780_cmn.c
  6. 1
      Targets/Bonito3a8780e/pci/rs780_cmn.c
  7. 1
      Targets/Bonito3a94w/pci/rs780_cmn.c
  8. 1
      Targets/Bonito3adawning/pci/rs780_cmn.c
  9. 1
      Targets/Bonito3aserver/pci/rs780_cmn.c
  10. 1
      Targets/Bonito3asis/pci/rs780_cmn.c
  11. 1
      Targets/LS2K/ls2k/tgt_machdep.c
  12. 1
      include/linux/libata.h
  13. 2
      pmon/cmds/memtst.c
  14. 2
      pmon/cmds/test/mem.c
  15. 1
      sys/dev/nand/ls2k-nand.c
  16. 1
      sys/dev/pci/e1000e/hw.h
  17. 1
      sys/dev/pci/igb1/e1000_osdep.h
  18. 2
      sys/dev/pci/rtl8168.h
  19. 1
      sys/dev/pci/rtl8169.c
  20. 1
      sys/linux/types.h

1
Targets/Bonito3a3000_7a/pci/ls7a_pci.c

@ -14,7 +14,6 @@ typedef unsigned long device_t;
#define HT_CONF_TYPE0_ADDR 0x90000efdfe000000
#define HT_MAP_TYPE0_CONF_ADDR BONITO_PCICFG0_BASE_VA
typedef unsigned long long u64;
extern struct pci_device *_pci_bus[16];
extern int _max_pci_bus;

2
Targets/Bonito3a4000_7a/Bonito/tgt_machdep.c

@ -42,6 +42,7 @@
#include <time.h>
#include <stdlib.h>
#include <dev/pci/pcivar.h>
#include <linux/types.h>
#include <autoconf.h>
#include <pmon.h>
@ -1656,7 +1657,6 @@ void ls_pcie_interrupt_fixup(void)
}
#define LOONGSON_HT1_INT_TRANS_ADDR 0x90000efdfb000270ULL
typedef unsigned long long u64;
u64 __raw__readq(u64 addr);
u64 __raw__writeq(u64 addr, u64 val);
void loongson_ht_trans_init(void)

1
Targets/Bonito3a780e/pci/rs780_cmn.c

@ -25,7 +25,6 @@
#define HT_MAP_TYPE0_CONF_ADDR BONITO_PCICFG0_BASE_VA
typedef unsigned long long u64;
u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
//u64 addr = 0x90000efdfe000000;
u32 addr = HT_MAP_TYPE0_CONF_ADDR;

1
Targets/Bonito3a82w/pci/rs780_cmn.c

@ -25,7 +25,6 @@
#define HT_MAP_TYPE0_CONF_ADDR BONITO_PCICFG0_BASE_VA
typedef unsigned long long u64;
u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
//u64 addr = 0x90000efdfe000000;
u32 addr = HT_MAP_TYPE0_CONF_ADDR;

1
Targets/Bonito3a84w/pci/rs780_cmn.c

@ -25,7 +25,6 @@
#define HT_MAP_TYPE0_CONF_ADDR BONITO_PCICFG0_BASE_VA
typedef unsigned long long u64;
u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
//u64 addr = 0x90000efdfe000000;
u32 addr = HT_MAP_TYPE0_CONF_ADDR;

1
Targets/Bonito3a8780e/pci/rs780_cmn.c

@ -25,7 +25,6 @@
#define HT_MAP_TYPE0_CONF_ADDR BONITO_PCICFG0_BASE_VA
typedef unsigned long long u64;
u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
//u64 addr = 0x90000efdfe000000;
u32 addr = HT_MAP_TYPE0_CONF_ADDR;

1
Targets/Bonito3a94w/pci/rs780_cmn.c

@ -25,7 +25,6 @@
#define HT_MAP_TYPE0_CONF_ADDR BONITO_PCICFG0_BASE_VA
typedef unsigned long long u64;
u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
//u64 addr = 0x90000efdfe000000;
u32 addr = HT_MAP_TYPE0_CONF_ADDR;

1
Targets/Bonito3adawning/pci/rs780_cmn.c

@ -25,7 +25,6 @@
#define HT_MAP_TYPE0_CONF_ADDR BONITO_PCICFG0_BASE_VA
typedef unsigned long long u64;
u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
//u64 addr = 0x90000efdfe000000;
u32 addr = HT_MAP_TYPE0_CONF_ADDR;

1
Targets/Bonito3aserver/pci/rs780_cmn.c

@ -25,7 +25,6 @@
#define HT_MAP_TYPE0_CONF_ADDR BONITO_PCICFG0_BASE_VA
typedef unsigned long long u64;
u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
//u64 addr = 0x90000efdfe000000;
u32 addr = HT_MAP_TYPE0_CONF_ADDR;

1
Targets/Bonito3asis/pci/rs780_cmn.c

@ -25,7 +25,6 @@
#define HT_MAP_TYPE0_CONF_ADDR BONITO_PCICFG0_BASE_VA
typedef unsigned long long u64;
u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
//u64 addr = 0x90000efdfe000000;
u32 addr = HT_MAP_TYPE0_CONF_ADDR;

1
Targets/LS2K/ls2k/tgt_machdep.c

@ -1971,7 +1971,6 @@ struct pci_config_data pci_config_array[] = {
};
int pci_config_array_size = ARRAY_SIZE(pci_config_array);
typedef unsigned long long u64;
u64 __raw__readq(u64 addr);
u64 __raw__writeq(u64 addr, u64 val);
void ls_pcie_config_set(void)

1
include/linux/libata.h

@ -31,7 +31,6 @@ typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
#endif
typedef unsigned long long u64;
enum {
/* various global constants */

2
pmon/cmds/memtst.c

@ -38,13 +38,13 @@
#undef _KERNEL
#endif
#include <sys/ioctl.h>
#include <linux/types.h>
#include <pmon.h>
int cmd_memtst __P((int, char *[]));
int cmd_spacescan __P((int, char *[]));
static int do_mt __P((u_int32_t *, u_int32_t *, int));
#define u64 unsigned long long
extern u64 __raw__readq(u64 addr);
extern u64 __raw__writeq(u64 addr, u64 val);

2
pmon/cmds/test/mem.c

@ -1,11 +1,11 @@
#include <stdio.h>
#include <string.h>
#include <linux/types.h>
#ifdef LOONGSON_3A2H
#define ADDR_ORIG 0x9000000004000000
#define ADDR_TARGET 0x9000000005000000
#define u64 unsigned long long
extern u64 __raw__writeq(u64 addr, u64 val);
extern u64 __raw__readq(u64 q);

1
sys/dev/nand/ls2k-nand.c

@ -95,7 +95,6 @@
#define show_debug_msk(x,y) do{ if(show_data_debug) \
{printk(KERN_ERR "%s:\n",__func__);show_data(x,y);}}while(0)
typedef unsigned long long u64;
typedef unsigned long dma_addr_t;
#define init_completion(...)
#define dma_alloc_coherent(dev,size,handle,flag) _dma_alloc_coherent(size,handle)

1
sys/dev/pci/e1000e/hw.h

@ -34,7 +34,6 @@
#if 1 //zxj
typedef unsigned int bool;
typedef unsigned long long __u64;
typedef unsigned long long u64;
typedef unsigned int __u32;
typedef unsigned short __u16;
typedef signed int __s32;

1
sys/dev/pci/igb1/e1000_osdep.h

@ -34,7 +34,6 @@
#define udelay(us) delay(us)
typedef unsigned int bool;
typedef unsigned long long __u64;
typedef unsigned long long u64;
typedef unsigned int __u32;
typedef unsigned short __u16;
typedef signed int __s32;

2
sys/dev/pci/rtl8168.h

@ -244,8 +244,6 @@ enum effuse {
#define RsvdMask 0x3fffc000
typedef unsigned long long u64;
struct TxDesc {
u32 opts1;
u32 opts2;

1
sys/dev/pci/rtl8169.c

@ -246,7 +246,6 @@ static const int multicast_filter_limit = 32;
static int if_in_attach;
static int if_frequency;
typedef unsigned long long u64;
struct TxDesc {
u32 opts1;

1
sys/linux/types.h

@ -2,6 +2,7 @@
#define __LINUX_TYPES_H_
typedef unsigned long long u64;
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;

Loading…
Cancel
Save