mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 15:37:23 +00:00
44d0677a90
A number of headers define functions as "extern inline" which is causing problems with gcc5. The reason is that starting with version 5.1, gcc defaults to the standard C99 semantics for the inline keyword. Under the traditional GNU inline semantics, an "extern inline" function would never create an external definition, the same as inline *without* extern in C99. In C99, and "extern inline" definition is simply an external definition with an inline hint. In short, the meanings of inline with and without extern are swapped between GNU and C99. The upshot is that all these definitions in header files create an external definition wherever those headers are included, resulting in multiple definition errors at link time. Changing all these functions to "static inline" fixes the problem since this works as desired in all gcc versions. Although the semantics are slightly different (a static inline definition may result in an actual function being emitted), it works as intended in practice. This patch also removes extern prototype declarations for the changed functions where they existed. Signed-off-by: Mans Rullgard <mans@mansr.com>
168 lines
4.3 KiB
C
168 lines
4.3 KiB
C
/*
|
|
* MPC8260 I/O port pin manipulation functions
|
|
*/
|
|
|
|
#ifndef _ASM_IOPIN_8260_H_
|
|
#define _ASM_IOPIN_8260_H_
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/immap_8260.h>
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
typedef
|
|
struct {
|
|
u_char port:2; /* port number (A=0, B=1, C=2, D=3) */
|
|
u_char pin:5; /* port pin (0-31) */
|
|
u_char flag:1; /* for whatever */
|
|
}
|
|
iopin_t;
|
|
|
|
#define IOPIN_PORTA 0
|
|
#define IOPIN_PORTB 1
|
|
#define IOPIN_PORTC 2
|
|
#define IOPIN_PORTD 3
|
|
|
|
static __inline__ void
|
|
iopin_set_high(iopin_t *iopin)
|
|
{
|
|
volatile uint *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdata;
|
|
datp[iopin->port * 8] |= (1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ void
|
|
iopin_set_low(iopin_t *iopin)
|
|
{
|
|
volatile uint *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdata;
|
|
datp[iopin->port * 8] &= ~(1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_high(iopin_t *iopin)
|
|
{
|
|
volatile uint *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdata;
|
|
return (datp[iopin->port * 8] >> (31 - iopin->pin)) & 1;
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_low(iopin_t *iopin)
|
|
{
|
|
volatile uint *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdata;
|
|
return ((datp[iopin->port * 8] >> (31 - iopin->pin)) & 1) ^ 1;
|
|
}
|
|
|
|
static __inline__ void
|
|
iopin_set_out(iopin_t *iopin)
|
|
{
|
|
volatile uint *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdira;
|
|
dirp[iopin->port * 8] |= (1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ void
|
|
iopin_set_in(iopin_t *iopin)
|
|
{
|
|
volatile uint *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdira;
|
|
dirp[iopin->port * 8] &= ~(1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_out(iopin_t *iopin)
|
|
{
|
|
volatile uint *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdira;
|
|
return (dirp[iopin->port * 8] >> (31 - iopin->pin)) & 1;
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_in(iopin_t *iopin)
|
|
{
|
|
volatile uint *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdira;
|
|
return ((dirp[iopin->port * 8] >> (31 - iopin->pin)) & 1) ^ 1;
|
|
}
|
|
|
|
static __inline__ void
|
|
iopin_set_odr(iopin_t *iopin)
|
|
{
|
|
volatile uint *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_podra;
|
|
odrp[iopin->port * 8] |= (1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ void
|
|
iopin_set_act(iopin_t *iopin)
|
|
{
|
|
volatile uint *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_podra;
|
|
odrp[iopin->port * 8] &= ~(1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_odr(iopin_t *iopin)
|
|
{
|
|
volatile uint *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_podra;
|
|
return (odrp[iopin->port * 8] >> (31 - iopin->pin)) & 1;
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_act(iopin_t *iopin)
|
|
{
|
|
volatile uint *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_podra;
|
|
return ((odrp[iopin->port * 8] >> (31 - iopin->pin)) & 1) ^ 1;
|
|
}
|
|
|
|
static __inline__ void
|
|
iopin_set_ded(iopin_t *iopin)
|
|
{
|
|
volatile uint *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_ppara;
|
|
parp[iopin->port * 8] |= (1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ void
|
|
iopin_set_gen(iopin_t *iopin)
|
|
{
|
|
volatile uint *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_ppara;
|
|
parp[iopin->port * 8] &= ~(1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_ded(iopin_t *iopin)
|
|
{
|
|
volatile uint *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_ppara;
|
|
return (parp[iopin->port * 8] >> (31 - iopin->pin)) & 1;
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_gen(iopin_t *iopin)
|
|
{
|
|
volatile uint *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_ppara;
|
|
return ((parp[iopin->port * 8] >> (31 - iopin->pin)) & 1) ^ 1;
|
|
}
|
|
|
|
static __inline__ void
|
|
iopin_set_opt2(iopin_t *iopin)
|
|
{
|
|
volatile uint *sorp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_psora;
|
|
sorp[iopin->port * 8] |= (1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ void
|
|
iopin_set_opt1(iopin_t *iopin)
|
|
{
|
|
volatile uint *sorp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_psora;
|
|
sorp[iopin->port * 8] &= ~(1 << (31 - iopin->pin));
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_opt2(iopin_t *iopin)
|
|
{
|
|
volatile uint *sorp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_psora;
|
|
return (sorp[iopin->port * 8] >> (31 - iopin->pin)) & 1;
|
|
}
|
|
|
|
static __inline__ uint
|
|
iopin_is_opt1(iopin_t *iopin)
|
|
{
|
|
volatile uint *sorp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_psora;
|
|
return ((sorp[iopin->port * 8] >> (31 - iopin->pin)) & 1) ^ 1;
|
|
}
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _ASM_IOPIN_8260_H_ */
|