powerpc/ppc4xx: Remove typedefs for gdsys FPGA

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/board/gdsys/405ep/405ep.c b/board/gdsys/405ep/405ep.c
index bea671e1f7bcb0351ac9278ab995ac0486bcf7ac..bc9b7d0a971bd78bfd62f5000d95813d0ded3e63 100644 (file)
--- a/board/gdsys/405ep/405ep.c
+++ b/board/gdsys/405ep/405ep.c
@@ -105,7 +105,8 @@ int board_early_init_r(void)
        gd405ep_set_fpga_reset(0);
 
        for (k = 0; k < CONFIG_SYS_FPGA_COUNT; ++k) {
-               ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(k);
+               struct ihs_fpga *fpga =
+                       (struct ihs_fpga *)CONFIG_SYS_FPGA_BASE(k);
 #ifdef CONFIG_SYS_FPGA_NO_RFL_HI
                u16 *reflection_target = &fpga->reflection_low;
 #else

diff --git a/board/gdsys/405ep/dlvision-10g.c b/board/gdsys/405ep/dlvision-10g.c
index d7e0d66c1208b1f98ba83a3d3cb3e2771021a33d..644493baafd71735aef05a2b67ab5da8a431e829 100644 (file)
--- a/board/gdsys/405ep/dlvision-10g.c
+++ b/board/gdsys/405ep/dlvision-10g.c
@@ -95,7 +95,7 @@ static unsigned int get_mc2_present(void)
 
 static void print_fpga_info(unsigned dev)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(dev);
+       struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(dev);
        u16 versions = in_le16(&fpga->versions);
        u16 fpga_version = in_le16(&fpga->fpga_version);
        u16 fpga_features = in_le16(&fpga->fpga_features);
@@ -263,7 +263,7 @@ int checkboard(void)
 
 int last_stage_init(void)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0);
+       struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(0);
        u16 versions = in_le16(&fpga->versions);
 
        print_fpga_info(0);

diff --git a/board/gdsys/405ep/io.c b/board/gdsys/405ep/io.c
index 85b61f1f4bbe5e2d284f7876656ab7d91382d7c7..070dcbbdfc1aff542c7fd20c3449111ba746cd4d 100644 (file)
--- a/board/gdsys/405ep/io.c
+++ b/board/gdsys/405ep/io.c
@@ -117,7 +117,7 @@ int checkboard(void)
 
 static void print_fpga_info(void)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0);
+       struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(0);
        u16 versions = in_le16(&fpga->versions);
        u16 fpga_version = in_le16(&fpga->fpga_version);
        u16 fpga_features = in_le16(&fpga->fpga_features);
@@ -179,7 +179,7 @@ static void print_fpga_info(void)
  */
 int last_stage_init(void)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0);
+       struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(0);
        unsigned int k;
 
        print_fpga_info();

diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c
index 0ffdb381d19a5b600934bc095fe0369336da7f92..0fc7db2012c9ba52d0ff12d5f10a948999a7b4a7 100644 (file)
--- a/board/gdsys/405ep/iocon.c
+++ b/board/gdsys/405ep/iocon.c
@@ -92,7 +92,7 @@ int checkboard(void)
 
 static void print_fpga_info(void)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0);
+       struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(0);
        u16 versions = in_le16(&fpga->versions);
        u16 fpga_version = in_le16(&fpga->fpga_version);
        u16 fpga_features = in_le16(&fpga->fpga_features);

diff --git a/board/gdsys/405ep/neo.c b/board/gdsys/405ep/neo.c
index f38edd2eb8101acb173d2e065a8e44360f9bd3a2..d336e55c5d4493c8468080e0d22d01e1430f9353 100644 (file)
--- a/board/gdsys/405ep/neo.c
+++ b/board/gdsys/405ep/neo.c
@@ -70,7 +70,7 @@ int checkboard(void)
 
 static void print_fpga_info(void)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0);
+       struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(0);
        u16 versions = in_le16(&fpga->versions);
        u16 fpga_version = in_le16(&fpga->fpga_version);
        u16 fpga_features = in_le16(&fpga->fpga_features);

diff --git a/board/gdsys/405ex/405ex.c b/board/gdsys/405ex/405ex.c
index 0d25214f4221fc9236064c0d32073dbde3c09619..5766c0f562fa953a9105ae6b703c04b7430d60c2 100644 (file)
--- a/board/gdsys/405ex/405ex.c
+++ b/board/gdsys/405ex/405ex.c
@@ -219,7 +219,8 @@ int board_early_init_r(void)
        gd405ex_set_fpga_reset(0);
 
        for (k = 0; k < CONFIG_SYS_FPGA_COUNT; ++k) {
-               ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(k);
+               struct ihs_fpga *fpga =
+                       (struct ihs_fpga *)CONFIG_SYS_FPGA_BASE(k);
 #ifdef CONFIG_SYS_FPGA_NO_RFL_HI
                u16 *reflection_target = &fpga->reflection_low;
 #else

diff --git a/board/gdsys/405ex/io64.c b/board/gdsys/405ex/io64.c
index 177141dcc36cf94260932fea76c2a0dc1abc44b2..41fdef7da81bb8919d36150923a0a1add6b3489f 100644 (file)
--- a/board/gdsys/405ex/io64.c
+++ b/board/gdsys/405ex/io64.c
@@ -100,7 +100,7 @@ int misc_init_r(void)
 
 static void print_fpga_info(unsigned dev)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(dev);
+       struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(dev);
        u16 versions = in_le16(&fpga->versions);
        u16 fpga_version = in_le16(&fpga->fpga_version);
        u16 fpga_features = in_le16(&fpga->fpga_features);
@@ -242,8 +242,8 @@ int last_stage_init(void)
 {
        unsigned int k;
        unsigned int fpga;
-       ihs_fpga_t *fpga0 = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0);
-       ihs_fpga_t *fpga1 = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(1);
+       struct ihs_fpga *fpga0 = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(0);
+       struct ihs_fpga *fpga1 = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(1);
        int failed = 0;
        char str_phys[] = "Setup PHYs -";
        char str_serdes[] = "Start SERDES blocks";

diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index 5065f9d5e40a3ad729e88c5be2d1ec14036f0464..a192c9851b3db3a6c89b159a3938ca5196f02d3a 100644 (file)
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -70,8 +70,8 @@ enum {
 #if defined(CONFIG_SYS_ICS8N3QV01) || defined(CONFIG_SYS_SIL1178)
 static void fpga_iic_write(unsigned screen, u8 slave, u8 reg, u8 data)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(screen);
-       ihs_i2c_t *i2c = &fpga->i2c;
+       struct ihs_fpga *fpga = (struct ihs_fpga *)CONFIG_SYS_FPGA_BASE(screen);
+       struct ihs_i2c *i2c = &fpga->i2c;
 
        while (in_le16(&fpga->extended_interrupt) & (1 << 12))
                ;
@@ -81,8 +81,8 @@ static void fpga_iic_write(unsigned screen, u8 slave, u8 reg, u8 data)
 
 static u8 fpga_iic_read(unsigned screen, u8 slave, u8 reg)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(screen);
-       ihs_i2c_t *i2c = &fpga->i2c;
+       struct ihs_fpga *fpga = (struct ihs_fpga *)CONFIG_SYS_FPGA_BASE(screen);
+       struct ihs_i2c *i2c = &fpga->i2c;
        unsigned int ctr = 0;
 
        while (in_le16(&fpga->extended_interrupt) & (1 << 12))
@@ -129,7 +129,7 @@ static void mpc92469ac_calc_parameters(unsigned int fout,
 
 static void mpc92469ac_set(unsigned screen, unsigned int fout)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(screen);
+       struct ihs_fpga *fpga = (struct ihs_fpga *)CONFIG_SYS_FPGA_BASE(screen);
        unsigned int n;
        unsigned int m;
        unsigned int bitval = 0;
@@ -265,8 +265,8 @@ static void ics8n3qv01_set(unsigned screen, unsigned int fout)
 static int osd_write_videomem(unsigned screen, unsigned offset,
        u16 *data, size_t charcount)
 {
-       ihs_fpga_t *fpga =
-               (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(screen);
+       struct ihs_fpga *fpga =
+               (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(screen);
        unsigned int k;
 
        for (k = 0; k < charcount; ++k) {
@@ -318,8 +318,8 @@ static int osd_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 int osd_probe(unsigned screen)
 {
-       ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(screen);
-       ihs_osd_t *osd = &fpga->osd;
+       struct ihs_fpga *fpga = (struct ihs_fpga *)CONFIG_SYS_FPGA_BASE(screen);
+       struct ihs_osd *osd = &fpga->osd;
        u16 version = in_le16(&osd->version);
        u16 features = in_le16(&osd->features);
        unsigned width;

diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h
index bfa656fdb5d41cc78d2e506662c61c08d8118581..1758d7445ee6d151d3ce1db317e89f42c8c77b20 100644 (file)
--- a/include/gdsys_fpga.h
+++ b/include/gdsys_fpga.h
@@ -35,20 +35,20 @@ enum {
 int get_fpga_state(unsigned dev);
 void print_fpga_state(unsigned dev);
 
-typedef struct ihs_gpio {
+struct ihs_gpio {
        u16 read;
        u16 clear;
        u16 set;
-} ihs_gpio_t;
+};
 
-typedef struct ihs_i2c {
+struct ihs_i2c {
        u16 write_mailbox;
        u16 write_mailbox_ext;
        u16 read_mailbox;
        u16 read_mailbox_ext;
-} ihs_i2c_t;
+};
 
-typedef struct ihs_osd {
+struct ihs_osd {
        u16 version;
        u16 features;
        u16 control;
@@ -56,21 +56,21 @@ typedef struct ihs_osd {
        u16 xy_scale;
        u16 x_pos;
        u16 y_pos;
-} ihs_osd_t;
+};
 
 #ifdef CONFIG_NEO
-typedef struct ihs_fpga {
+struct ihs_fpga {
        u16 reflection_low;     /* 0x0000 */
        u16 versions;           /* 0x0002 */
        u16 fpga_features;      /* 0x0004 */
        u16 fpga_version;       /* 0x0006 */
        u16 reserved_0[8187];   /* 0x0008 */
        u16 reflection_high;    /* 0x3ffe */
-} ihs_fpga_t;
+};
 #endif
 
 #ifdef CONFIG_IO
-typedef struct ihs_fpga {
+struct ihs_fpga {
        u16 reflection_low;     /* 0x0000 */
        u16 versions;           /* 0x0002 */
        u16 fpga_features;      /* 0x0004 */
@@ -79,11 +79,11 @@ typedef struct ihs_fpga {
        u16 quad_serdes_reset;  /* 0x0012 */
        u16 reserved_1[8181];   /* 0x0014 */
        u16 reflection_high;    /* 0x3ffe */
-} ihs_fpga_t;
+};
 #endif
 
 #ifdef CONFIG_IO64
-typedef struct ihs_fpga {
+struct ihs_fpga {
        u16 reflection_low;     /* 0x0000 */
        u16 versions;           /* 0x0002 */
        u16 fpga_features;      /* 0x0004 */
@@ -98,30 +98,30 @@ typedef struct ihs_fpga {
        u16 ch0_hicb_config_int;/* 0x0502 */
        u16 reserved_3[7549];   /* 0x0504 */
        u16 reflection_high;    /* 0x3ffe */
-} ihs_fpga_t;
+};
 #endif
 
 #ifdef CONFIG_IOCON
-typedef struct ihs_fpga {
+struct ihs_fpga {
        u16 reflection_low;     /* 0x0000 */
        u16 versions;           /* 0x0002 */
        u16 fpga_version;       /* 0x0004 */
        u16 fpga_features;      /* 0x0006 */
        u16 reserved_0[6];      /* 0x0008 */
-       ihs_gpio_t gpio;        /* 0x0014 */
+       struct ihs_gpio gpio;   /* 0x0014 */
        u16 mpc3w_control;      /* 0x001a */
        u16 reserved_1[19];     /* 0x001c */
        u16 videocontrol;       /* 0x0042 */
        u16 reserved_2[93];     /* 0x0044 */
        u16 reflection_high;    /* 0x00fe */
-       ihs_osd_t osd;          /* 0x0100 */
+       struct ihs_osd osd;     /* 0x0100 */
        u16 reserved_3[889];    /* 0x010e */
        u16 videomem;           /* 0x0800 */
-} ihs_fpga_t;
+};
 #endif
 
 #ifdef CONFIG_DLVISION_10G
-typedef struct ihs_fpga {
+struct ihs_fpga {
        u16 reflection_low;     /* 0x0000 */
        u16 versions;           /* 0x0002 */
        u16 fpga_version;       /* 0x0004 */
@@ -129,16 +129,16 @@ typedef struct ihs_fpga {
        u16 reserved_0[10];     /* 0x0008 */
        u16 extended_interrupt; /* 0x001c */
        u16 reserved_1[9];      /* 0x001e */
-       ihs_i2c_t i2c;          /* 0x0030 */
+       struct ihs_i2c i2c;     /* 0x0030 */
        u16 reserved_2[16];     /* 0x0038 */
        u16 mpc3w_control;      /* 0x0058 */
        u16 reserved_3[34];     /* 0x005a */
        u16 videocontrol;       /* 0x009e */
        u16 reserved_4[176];    /* 0x00a0 */
-       ihs_osd_t osd;          /* 0x0200 */
+       struct ihs_osd osd;     /* 0x0200 */
        u16 reserved_5[761];    /* 0x020e */
        u16 videomem;           /* 0x0800 */
-} ihs_fpga_t;
+};
 #endif
 
 #endif