summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-24 09:38:28 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-24 09:38:28 +0000
commit997df70f6e1e51d36c25ed21c4cbb37ab5f732ad (patch)
tree7275b476f54abd3a12e4a9ca6ede97e7f2a11da8 /src
parentfddbc58091cc13934b0e6e4f835884dcdefd4e09 (diff)
downloadopenocd_libswd-997df70f6e1e51d36c25ed21c4cbb37ab5f732ad.tar.gz
openocd_libswd-997df70f6e1e51d36c25ed21c4cbb37ab5f732ad.tar.bz2
openocd_libswd-997df70f6e1e51d36c25ed21c4cbb37ab5f732ad.tar.xz
openocd_libswd-997df70f6e1e51d36c25ed21c4cbb37ab5f732ad.zip
Minor fixes to new at91sam3 files for x86-32/64 compilation problems.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2399 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/flash/at91sam3.c71
1 files changed, 49 insertions, 22 deletions
diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index c55034dc..449bcae7 100644
--- 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;