Replace __attribute references with __attribute__
__attribute__ follows gcc's documented syntax and is generally more common than __attribute. This change is only asthetic and should not affect functionality. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
parent
08f077da92
commit
f9a109b3ad
|
@ -53,10 +53,11 @@ typedef struct {
|
||||||
#if defined(CONFIG_CMD_NET)
|
#if defined(CONFIG_CMD_NET)
|
||||||
|
|
||||||
/* alignment as per Errata #11 (64 bytes) is insufficient! */
|
/* alignment as per Errata #11 (64 bytes) is insufficient! */
|
||||||
rbf_t rbfdt[RBF_FRAMEMAX] __attribute((aligned(512)));
|
rbf_t rbfdt[RBF_FRAMEMAX] __attribute__((aligned(512)));
|
||||||
rbf_t *rbfp;
|
rbf_t *rbfp;
|
||||||
|
|
||||||
unsigned char rbf_framebuf[RBF_FRAMEMAX][RBF_FRAMELEN] __attribute((aligned(4)));
|
unsigned char rbf_framebuf[RBF_FRAMEMAX][RBF_FRAMELEN]
|
||||||
|
__attribute__((aligned(4)));
|
||||||
|
|
||||||
/* structure to interface the PHY */
|
/* structure to interface the PHY */
|
||||||
AT91S_PhyOps PhyOps;
|
AT91S_PhyOps PhyOps;
|
||||||
|
|
|
@ -55,7 +55,7 @@ struct ed {
|
||||||
|
|
||||||
struct usb_device *usb_dev;
|
struct usb_device *usb_dev;
|
||||||
__u32 unused[3];
|
__u32 unused[3];
|
||||||
} __attribute((aligned(16)));
|
} __attribute__((aligned(16)));
|
||||||
typedef struct ed ed_t;
|
typedef struct ed ed_t;
|
||||||
|
|
||||||
|
|
||||||
|
@ -112,7 +112,7 @@ struct td {
|
||||||
__u32 data;
|
__u32 data;
|
||||||
|
|
||||||
__u32 unused2[2];
|
__u32 unused2[2];
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
typedef struct td td_t;
|
typedef struct td td_t;
|
||||||
|
|
||||||
#define OHCI_ED_SKIP (1 << 14)
|
#define OHCI_ED_SKIP (1 << 14)
|
||||||
|
@ -130,7 +130,7 @@ struct ohci_hcca {
|
||||||
__u16 pad1; /* set to 0 on each frame_no change */
|
__u16 pad1; /* set to 0 on each frame_no change */
|
||||||
__u32 done_head; /* info returned for an interrupt */
|
__u32 done_head; /* info returned for an interrupt */
|
||||||
u8 reserved_for_hc[116];
|
u8 reserved_for_hc[116];
|
||||||
} __attribute((aligned(256)));
|
} __attribute__((aligned(256)));
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -172,7 +172,7 @@ struct ohci_regs {
|
||||||
__u32 status;
|
__u32 status;
|
||||||
__u32 portstatus[MAX_ROOT_PORTS];
|
__u32 portstatus[MAX_ROOT_PORTS];
|
||||||
} roothub;
|
} roothub;
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
|
|
||||||
|
|
||||||
/* OHCI CONTROL AND STATUS REGISTER MASKS */
|
/* OHCI CONTROL AND STATUS REGISTER MASKS */
|
||||||
|
|
|
@ -56,7 +56,7 @@ struct ed {
|
||||||
|
|
||||||
struct usb_device *usb_dev;
|
struct usb_device *usb_dev;
|
||||||
__u32 unused[3];
|
__u32 unused[3];
|
||||||
} __attribute((aligned(16)));
|
} __attribute__((aligned(16)));
|
||||||
typedef struct ed ed_t;
|
typedef struct ed ed_t;
|
||||||
|
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ struct td {
|
||||||
__u32 data;
|
__u32 data;
|
||||||
|
|
||||||
__u32 unused2[2];
|
__u32 unused2[2];
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
typedef struct td td_t;
|
typedef struct td td_t;
|
||||||
|
|
||||||
#define OHCI_ED_SKIP (1 << 14)
|
#define OHCI_ED_SKIP (1 << 14)
|
||||||
|
@ -132,7 +132,7 @@ struct ohci_hcca {
|
||||||
__u16 pad1; /* set to 0 on each frame_no change */
|
__u16 pad1; /* set to 0 on each frame_no change */
|
||||||
__u32 done_head; /* info returned for an interrupt */
|
__u32 done_head; /* info returned for an interrupt */
|
||||||
u8 reserved_for_hc[116];
|
u8 reserved_for_hc[116];
|
||||||
} __attribute((aligned(256)));
|
} __attribute__((aligned(256)));
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -174,7 +174,7 @@ struct ohci_regs {
|
||||||
__u32 status;
|
__u32 status;
|
||||||
__u32 portstatus[MAX_ROOT_PORTS];
|
__u32 portstatus[MAX_ROOT_PORTS];
|
||||||
} roothub;
|
} roothub;
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
|
|
||||||
|
|
||||||
/* OHCI CONTROL AND STATUS REGISTER MASKS */
|
/* OHCI CONTROL AND STATUS REGISTER MASKS */
|
||||||
|
|
|
@ -56,7 +56,7 @@ struct ed {
|
||||||
|
|
||||||
struct usb_device *usb_dev;
|
struct usb_device *usb_dev;
|
||||||
__u32 unused[3];
|
__u32 unused[3];
|
||||||
} __attribute((aligned(16)));
|
} __attribute__((aligned(16)));
|
||||||
typedef struct ed ed_t;
|
typedef struct ed ed_t;
|
||||||
|
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ struct td {
|
||||||
__u32 data;
|
__u32 data;
|
||||||
|
|
||||||
__u32 unused2[2];
|
__u32 unused2[2];
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
typedef struct td td_t;
|
typedef struct td td_t;
|
||||||
|
|
||||||
#define OHCI_ED_SKIP (1 << 14)
|
#define OHCI_ED_SKIP (1 << 14)
|
||||||
|
@ -136,7 +136,7 @@ struct ohci_hcca {
|
||||||
#endif
|
#endif
|
||||||
__u32 done_head; /* info returned for an interrupt */
|
__u32 done_head; /* info returned for an interrupt */
|
||||||
u8 reserved_for_hc[116];
|
u8 reserved_for_hc[116];
|
||||||
} __attribute((aligned(256)));
|
} __attribute__((aligned(256)));
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -178,7 +178,7 @@ struct ohci_regs {
|
||||||
__u32 status;
|
__u32 status;
|
||||||
__u32 portstatus[MAX_ROOT_PORTS];
|
__u32 portstatus[MAX_ROOT_PORTS];
|
||||||
} roothub;
|
} roothub;
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
|
|
||||||
|
|
||||||
/* OHCI CONTROL AND STATUS REGISTER MASKS */
|
/* OHCI CONTROL AND STATUS REGISTER MASKS */
|
||||||
|
|
|
@ -40,7 +40,7 @@ __board_reset(void)
|
||||||
{
|
{
|
||||||
/* Do nothing */
|
/* Do nothing */
|
||||||
}
|
}
|
||||||
void board_reset(void) __attribute((weak, alias("__board_reset")));
|
void board_reset(void) __attribute__((weak, alias("__board_reset")));
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
|
@ -55,7 +55,7 @@ struct ed {
|
||||||
|
|
||||||
struct usb_device *usb_dev;
|
struct usb_device *usb_dev;
|
||||||
__u32 unused[3];
|
__u32 unused[3];
|
||||||
} __attribute((aligned(16)));
|
} __attribute__((aligned(16)));
|
||||||
typedef struct ed ed_t;
|
typedef struct ed ed_t;
|
||||||
|
|
||||||
/* TD info field */
|
/* TD info field */
|
||||||
|
@ -111,7 +111,7 @@ struct td {
|
||||||
__u32 data;
|
__u32 data;
|
||||||
|
|
||||||
__u32 unused2[2];
|
__u32 unused2[2];
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
typedef struct td td_t;
|
typedef struct td td_t;
|
||||||
|
|
||||||
#define OHCI_ED_SKIP (1 << 14)
|
#define OHCI_ED_SKIP (1 << 14)
|
||||||
|
@ -134,7 +134,7 @@ struct ohci_hcca {
|
||||||
#endif
|
#endif
|
||||||
__u32 done_head; /* info returned for an interrupt */
|
__u32 done_head; /* info returned for an interrupt */
|
||||||
u8 reserved_for_hc[116];
|
u8 reserved_for_hc[116];
|
||||||
} __attribute((aligned(256)));
|
} __attribute__((aligned(256)));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Maximum number of root hub ports.
|
* Maximum number of root hub ports.
|
||||||
|
@ -175,7 +175,7 @@ struct ohci_regs {
|
||||||
__u32 status;
|
__u32 status;
|
||||||
__u32 portstatus[MAX_ROOT_PORTS];
|
__u32 portstatus[MAX_ROOT_PORTS];
|
||||||
} roothub;
|
} roothub;
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
|
|
||||||
/* OHCI CONTROL AND STATUS REGISTER MASKS */
|
/* OHCI CONTROL AND STATUS REGISTER MASKS */
|
||||||
|
|
||||||
|
|
|
@ -896,8 +896,8 @@ static int __def_mmc_init(bd_t *bis)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int cpu_mmc_init(bd_t *bis) __attribute((weak, alias("__def_mmc_init")));
|
int cpu_mmc_init(bd_t *bis) __attribute__((weak, alias("__def_mmc_init")));
|
||||||
int board_mmc_init(bd_t *bis) __attribute((weak, alias("__def_mmc_init")));
|
int board_mmc_init(bd_t *bis) __attribute__((weak, alias("__def_mmc_init")));
|
||||||
|
|
||||||
void print_mmc_devices(char separator)
|
void print_mmc_devices(char separator)
|
||||||
{
|
{
|
||||||
|
|
|
@ -101,7 +101,7 @@ struct ed {
|
||||||
struct usb_device *usb_dev;
|
struct usb_device *usb_dev;
|
||||||
void *purb;
|
void *purb;
|
||||||
__u32 unused[2];
|
__u32 unused[2];
|
||||||
} __attribute((aligned(16)));
|
} __attribute__((aligned(16)));
|
||||||
typedef struct ed ed_t;
|
typedef struct ed ed_t;
|
||||||
|
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ struct td {
|
||||||
__u32 data;
|
__u32 data;
|
||||||
|
|
||||||
__u32 unused2[2];
|
__u32 unused2[2];
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
typedef struct td td_t;
|
typedef struct td td_t;
|
||||||
|
|
||||||
#define OHCI_ED_SKIP (1 << 14)
|
#define OHCI_ED_SKIP (1 << 14)
|
||||||
|
@ -184,7 +184,7 @@ struct ohci_hcca {
|
||||||
#endif
|
#endif
|
||||||
__u32 done_head; /* info returned for an interrupt */
|
__u32 done_head; /* info returned for an interrupt */
|
||||||
u8 reserved_for_hc[116];
|
u8 reserved_for_hc[116];
|
||||||
} __attribute((aligned(256)));
|
} __attribute__((aligned(256)));
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -228,7 +228,7 @@ struct ohci_regs {
|
||||||
__u32 status;
|
__u32 status;
|
||||||
__u32 portstatus[CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS];
|
__u32 portstatus[CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS];
|
||||||
} roothub;
|
} roothub;
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
|
|
||||||
/* Some EHCI controls */
|
/* Some EHCI controls */
|
||||||
#define EHCI_USBCMD_OFF 0x20
|
#define EHCI_USBCMD_OFF 0x20
|
||||||
|
|
|
@ -97,7 +97,7 @@ struct musb_regs {
|
||||||
u8 rxhubaddr;
|
u8 rxhubaddr;
|
||||||
u8 rxhubport;
|
u8 rxhubport;
|
||||||
} tar[16];
|
} tar[16];
|
||||||
} __attribute((aligned(32)));
|
} __attribute__((aligned(32)));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MUSB Register bits
|
* MUSB Register bits
|
||||||
|
|
|
@ -21,7 +21,7 @@ __extension__ typedef unsigned long long __u64;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
__u32 u[4];
|
__u32 u[4];
|
||||||
} __attribute((aligned(16))) vector128;
|
} __attribute__((aligned(16))) vector128;
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -21,7 +21,7 @@ __extension__ typedef unsigned long long __u64;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
__u32 u[4];
|
__u32 u[4];
|
||||||
} __attribute((aligned(16))) vector128;
|
} __attribute__((aligned(16))) vector128;
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -42,7 +42,7 @@ typedef unsigned long long __u64;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
__u32 u[4];
|
__u32 u[4];
|
||||||
} __attribute((aligned(16))) vector128;
|
} __attribute__((aligned(16))) vector128;
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -68,8 +68,8 @@ static int __def_eth_init(bd_t *bis)
|
||||||
{
|
{
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
|
int cpu_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init")));
|
||||||
int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
|
int board_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init")));
|
||||||
|
|
||||||
extern int mv6436x_eth_initialize(bd_t *);
|
extern int mv6436x_eth_initialize(bd_t *);
|
||||||
extern int mv6446x_eth_initialize(bd_t *);
|
extern int mv6446x_eth_initialize(bd_t *);
|
||||||
|
|
Loading…
Reference in New Issue