flash/nand/lpc32xx: Remove typedef'd struct 32/6032/2
authorMarc Schink <dev@zapb.de>
Tue, 26 Jan 2021 08:04:57 +0000 (09:04 +0100)
committerAntonio Borneo <borneo.antonio@gmail.com>
Wed, 10 Mar 2021 21:29:58 +0000 (21:29 +0000)
The C style guide forbids typedef'd structs, see 'Naming Rules'.

Change-Id: I983dd52307136d1b5adb58d8c44c0c14422d31e2
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/6032
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
src/flash/nand/lpc32xx.c

index d516522f3de000b3557f6a752a1a6006c1a64909..6443beb39ee649e9496f02a57c27622aefc45361 100644 (file)
@@ -60,14 +60,14 @@ static const int lp_ooblayout[] = {
        58, 59, 60, 61, 62, 63
 };
 
-typedef struct {
+struct dmac_ll {
        volatile uint32_t dma_src;
        volatile uint32_t dma_dest;
        volatile uint32_t next_lli;
        volatile uint32_t next_ctrl;
-} dmac_ll_t;
+};
 
-static dmac_ll_t dmalist[(2048/256) * 2 + 1];
+static struct dmac_ll dmalist[(2048/256) * 2 + 1];
 
 /* nand device lpc32xx <target#> <oscillator_frequency>
  */
@@ -867,14 +867,14 @@ static int lpc32xx_make_dma_list(uint32_t target_mem_base, uint32_t page_size,
                dmalist[i*2].dma_src = (do_read ? dmasrc : (dmasrc + i * 256));
                dmalist[i*2].dma_dest = (do_read ? (dmadst + i * 256) : dmadst);
                dmalist[i*2].next_lli =
-                       target_mem_base + (i*2 + 1) * sizeof(dmac_ll_t);
+                       target_mem_base + (i*2 + 1) * sizeof(struct dmac_ll);
                dmalist[i*2].next_ctrl = ctrl;
 
                dmalist[(i*2) + 1].dma_src = 0x20020034;/* SLC_ECC */
                dmalist[(i*2) + 1].dma_dest =
                        target_mem_base + ECC_OFFS + i * 4;
                dmalist[(i*2) + 1].next_lli =
-                       target_mem_base + (i*2 + 2) * sizeof(dmac_ll_t);
+                       target_mem_base + (i*2 + 2) * sizeof(struct dmac_ll);
                dmalist[(i*2) + 1].next_ctrl = ecc_ctrl;
 
        }
@@ -1063,7 +1063,7 @@ static int lpc32xx_write_page_slc(struct nand_device *nand,
           XXX: Assumes host and target have same byte sex.
        */
        retval = target_write_memory(target, target_mem_base, 4,
-                       nll * sizeof(dmac_ll_t) / 4,
+                       nll * sizeof(struct dmac_ll) / 4,
                        (uint8_t *)dmalist);
        if (ERROR_OK != retval) {
                LOG_ERROR("Could not write DMA descriptors to IRAM");
@@ -1104,7 +1104,7 @@ static int lpc32xx_write_page_slc(struct nand_device *nand,
 
                /* Write first descriptor to DMA controller */
                retval = target_write_memory(target, 0x31000100, 4,
-                               sizeof(dmac_ll_t) / 4,
+                               sizeof(struct dmac_ll) / 4,
                                (uint8_t *)dmalist);
                if (ERROR_OK != retval) {
                        LOG_ERROR("Could not write DMA descriptor to DMAC");
@@ -1161,7 +1161,7 @@ static int lpc32xx_write_page_slc(struct nand_device *nand,
 
        /* Write OOB descriptor to DMA controller */
        retval = target_write_memory(target, 0x31000100, 4,
-                       sizeof(dmac_ll_t) / 4,
+                       sizeof(struct dmac_ll) / 4,
                        (uint8_t *)(&dmalist[nll-1]));
        if (ERROR_OK != retval) {
                LOG_ERROR("Could not write OOB DMA descriptor to DMAC");
@@ -1460,7 +1460,7 @@ static int lpc32xx_read_page_slc(struct nand_device *nand,
           XXX: Assumes host and target have same byte sex.
        */
        retval = target_write_memory(target, target_mem_base, 4,
-                       nll * sizeof(dmac_ll_t) / 4,
+                       nll * sizeof(struct dmac_ll) / 4,
                        (uint8_t *)dmalist);
        if (ERROR_OK != retval) {
                LOG_ERROR("Could not write DMA descriptors to IRAM");
@@ -1489,7 +1489,7 @@ static int lpc32xx_read_page_slc(struct nand_device *nand,
 
        /* Write first descriptor to DMA controller */
        retval = target_write_memory(target, 0x31000100, 4,
-                       sizeof(dmac_ll_t) / 4, (uint8_t *)dmalist);
+                       sizeof(struct dmac_ll) / 4, (uint8_t *)dmalist);
        if (ERROR_OK != retval) {
                LOG_ERROR("Could not write DMA descriptor to DMAC");
                return retval;

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)