Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: fddbc58)
Minor fixes to new at91sam3 files for x86-32/64 compilation problems.
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Wed, 24 Jun 2009 09:38:28 +0000 (09:38 +0000)
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Wed, 24 Jun 2009 09:38:28 +0000 (09:38 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@2399 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/flash/at91sam3.c patch | blob | history

diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index c55034dc356904612a0e90e4b0268123c8f66574..449bcae786d67bc3d84c8966d1859f1c10515e2d 100644 (file)
--- a/src/flash/at91sam3.c
+++ b/src/flash/at91sam3.c
@@ -286,7 +286,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
                //      else
                //         Bank1 is the boot rom
                //      endif
-               .bank[0] = {
+//             .bank[0] = {
+               {
+                 {
                        .probed = 0,
                        .pChip  = NULL,
                        .pBank  = NULL,
@@ -298,9 +300,10 @@ static const struct sam3_chip_details all_sam3_details[] = {
                        .nsectors   = 16,
                        .sector_size = 8192,
                        .page_size   = 256,
-               },
+                 },
 
-               .bank[1] = {
+//             .bank[1] = {
+                 {
                        .probed = 0,
                        .pChip  = NULL,
                        .pBank  = NULL,
@@ -312,6 +315,7 @@ static const struct sam3_chip_details all_sam3_details[] = {
                        .nsectors   = 16,
                        .sector_size = 8192,
                        .page_size   = 256,
+                 },
                },
        },
 
@@ -331,7 +335,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
                //         boot is via FLASH
                //         Selection is via gpnvm[2]
                //     endif
-               .bank[0] = {
+//             .bank[0] = {
+               {
+                 {
                        .probed = 0,
                        .pChip  = NULL,
                        .pBank  = NULL,
@@ -343,12 +349,13 @@ static const struct sam3_chip_details all_sam3_details[] = {
                        .nsectors   = 16,
                        .sector_size = 8192,
                        .page_size   = 256,
-               },
-
-               .bank[1] = {
+                 },
+//               .bank[1] = {
+                 {
                        .present = 0,
                        .probed = 0,
                        .bank_number = 1,
+                 },
                },
        },
        {
@@ -369,7 +376,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
                //     endif
                //
 
-               .bank[0] = {
+//             .bank[0] = {
+               {
+                 {
                        .probed = 0,
                        .pChip  = NULL,
                        .pBank  = NULL,
@@ -381,12 +390,14 @@ static const struct sam3_chip_details all_sam3_details[] = {
                        .nsectors   =  8,
                        .sector_size = 8192,
                        .page_size   = 256,
-               },
+                 },
 
-               .bank[1] = {
+//             .bank[1] = {
+                 {
                        .present = 0,
                        .probed = 0,
                        .bank_number = 1,
+                 },
                },
        },
 
@@ -413,7 +424,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
                //      else
                //         Bank1 is the boot rom
                //      endif
-               .bank[0] = {
+               {
+                 {
+//             .bank[0] = {
                        .probed = 0,
                        .pChip  = NULL,
                        .pBank  = NULL,
@@ -425,9 +438,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
                        .nsectors   = 16,
                        .sector_size = 8192,
                        .page_size   = 256,
-               },
-
-               .bank[1] = {
+                 },
+//             .bank[1] = {
+                 {
                        .probed = 0,
                        .pChip  = NULL,
                        .pBank  = NULL,
@@ -439,6 +452,7 @@ static const struct sam3_chip_details all_sam3_details[] = {
                        .nsectors   = 16,
                        .sector_size = 8192,
                        .page_size   = 256,
+                 },
                },
        },
 
@@ -458,7 +472,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
                //         boot is via FLASH
                //         Selection is via gpnvm[2]
                //     endif
-               .bank[0] = {
+               {
+//             .bank[0] = {
+                 {
                        .probed = 0,
                        .pChip  = NULL,
                        .pBank  = NULL,
@@ -470,12 +486,13 @@ static const struct sam3_chip_details all_sam3_details[] = {
                        .nsectors   = 16,
                        .sector_size = 8192,
                        .page_size   = 256,
-               },
-
-               .bank[1] = {
+                 },
+//             .bank[1] = {
+                 {
                        .present = 0,
                        .probed = 0,
                        .bank_number = 1,
+                 },
                },
        },
        {
@@ -496,7 +513,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
                //     endif
                //
 
-               .bank[0] = {
+               {
+//             .bank[0] = {
+                 {
                        .probed = 0,
                        .pChip  = NULL,
                        .pBank  = NULL,
@@ -508,12 +527,14 @@ static const struct sam3_chip_details all_sam3_details[] = {
                        .nsectors   =  8,
                        .sector_size = 8192,
                        .page_size   = 256,
-               },
-
-               .bank[1] = {
+                 },
+//             .bank[1] = {
+                 {
                        .present = 0,
                        .probed = 0,
                        .bank_number = 1,
+
+                 },
                },
        },
 
@@ -1313,6 +1334,9 @@ sam3_explain_mckr(struct sam3_chip *pChip)
                        cp  = "upll (*ERROR* UPLL is disabled)";
                }
                break;
+       default:
+               assert(0);
+               break;
        }
 
        sam3_sprintf(pChip, "%s (%3.03f Mhz)\n",
@@ -1351,6 +1375,9 @@ sam3_explain_mckr(struct sam3_chip *pChip)
                pdiv = 6;
                cp = "clock/6";
                break;
+       default:
+               assert(0);
+               break;
        }
        sam3_sprintf(pChip, "(%s)\n", cp);
        fin = fin / pdiv;
Open On-Chip Debugger

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)