interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
zwelch 2009-06-24 09:38:28 +00:00
parent fddbc58091
commit 997df70f6e
1 changed files with 49 additions and 22 deletions
src/flash
at91sam3.c

59
src/flash/at91sam3.c
View File

@ -286,7 +286,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
// else // else
// Bank1 is the boot rom // Bank1 is the boot rom
// endif // endif
.bank[0] = { // .bank[0] = {
{
{
.probed = 0, .probed = 0,
.pChip = NULL, .pChip = NULL,
.pBank = NULL, .pBank = NULL,
@ -300,7 +302,8 @@ static const struct sam3_chip_details all_sam3_details[] = {
.page_size = 256, .page_size = 256,
}, },
.bank[1] = { // .bank[1] = {
{
.probed = 0, .probed = 0,
.pChip = NULL, .pChip = NULL,
.pBank = NULL, .pBank = NULL,
@ -314,6 +317,7 @@ static const struct sam3_chip_details all_sam3_details[] = {
.page_size = 256, .page_size = 256,
}, },
}, },
},
{ {
.chipid_cidr = 0x281a0760, .chipid_cidr = 0x281a0760,
@ -331,7 +335,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
// boot is via FLASH // boot is via FLASH
// Selection is via gpnvm[2] // Selection is via gpnvm[2]
// endif // endif
.bank[0] = { // .bank[0] = {
{
{
.probed = 0, .probed = 0,
.pChip = NULL, .pChip = NULL,
.pBank = NULL, .pBank = NULL,
@ -344,13 +350,14 @@ static const struct sam3_chip_details all_sam3_details[] = {
.sector_size = 8192, .sector_size = 8192,
.page_size = 256, .page_size = 256,
}, },
// .bank[1] = {
.bank[1] = { {
.present = 0, .present = 0,
.probed = 0, .probed = 0,
.bank_number = 1, .bank_number = 1,
}, },
}, },
},
{ {
.chipid_cidr = 0x28190560, .chipid_cidr = 0x28190560,
.name = "at91sam3u1e", .name = "at91sam3u1e",
@ -369,7 +376,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
// endif // endif
// //
.bank[0] = { // .bank[0] = {
{
{
.probed = 0, .probed = 0,
.pChip = NULL, .pChip = NULL,
.pBank = NULL, .pBank = NULL,
@ -383,12 +392,14 @@ static const struct sam3_chip_details all_sam3_details[] = {
.page_size = 256, .page_size = 256,
}, },
.bank[1] = { // .bank[1] = {
{
.present = 0, .present = 0,
.probed = 0, .probed = 0,
.bank_number = 1, .bank_number = 1,
}, },
}, },
},
{ {
.chipid_cidr = 0x28000960, .chipid_cidr = 0x28000960,
@ -413,7 +424,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
// else // else
// Bank1 is the boot rom // Bank1 is the boot rom
// endif // endif
.bank[0] = { {
{
// .bank[0] = {
.probed = 0, .probed = 0,
.pChip = NULL, .pChip = NULL,
.pBank = NULL, .pBank = NULL,
@ -426,8 +439,8 @@ static const struct sam3_chip_details all_sam3_details[] = {
.sector_size = 8192, .sector_size = 8192,
.page_size = 256, .page_size = 256,
}, },
// .bank[1] = {
.bank[1] = { {
.probed = 0, .probed = 0,
.pChip = NULL, .pChip = NULL,
.pBank = NULL, .pBank = NULL,
@ -441,6 +454,7 @@ static const struct sam3_chip_details all_sam3_details[] = {
.page_size = 256, .page_size = 256,
}, },
}, },
},
{ {
.chipid_cidr = 0x280a0760, .chipid_cidr = 0x280a0760,
@ -458,7 +472,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
// boot is via FLASH // boot is via FLASH
// Selection is via gpnvm[2] // Selection is via gpnvm[2]
// endif // endif
.bank[0] = { {
// .bank[0] = {
{
.probed = 0, .probed = 0,
.pChip = NULL, .pChip = NULL,
.pBank = NULL, .pBank = NULL,
@ -471,13 +487,14 @@ static const struct sam3_chip_details all_sam3_details[] = {
.sector_size = 8192, .sector_size = 8192,
.page_size = 256, .page_size = 256,
}, },
// .bank[1] = {
.bank[1] = { {
.present = 0, .present = 0,
.probed = 0, .probed = 0,
.bank_number = 1, .bank_number = 1,
}, },
}, },
},
{ {
.chipid_cidr = 0x28090560, .chipid_cidr = 0x28090560,
.name = "at91sam3u1c", .name = "at91sam3u1c",
@ -496,7 +513,9 @@ static const struct sam3_chip_details all_sam3_details[] = {
// endif // endif
// //
.bank[0] = { {
// .bank[0] = {
{
.probed = 0, .probed = 0,
.pChip = NULL, .pChip = NULL,
.pBank = NULL, .pBank = NULL,
@ -509,11 +528,13 @@ static const struct sam3_chip_details all_sam3_details[] = {
.sector_size = 8192, .sector_size = 8192,
.page_size = 256, .page_size = 256,
}, },
// .bank[1] = {
.bank[1] = { {
.present = 0, .present = 0,
.probed = 0, .probed = 0,
.bank_number = 1, .bank_number = 1,
},
}, },
}, },
@ -1313,6 +1334,9 @@ sam3_explain_mckr(struct sam3_chip *pChip)
cp = "upll (*ERROR* UPLL is disabled)"; cp = "upll (*ERROR* UPLL is disabled)";
} }
break; break;
default:
assert(0);
break;
} }
sam3_sprintf(pChip, "%s (%3.03f Mhz)\n", sam3_sprintf(pChip, "%s (%3.03f Mhz)\n",
@ -1351,6 +1375,9 @@ sam3_explain_mckr(struct sam3_chip *pChip)
pdiv = 6; pdiv = 6;
cp = "clock/6"; cp = "clock/6";
break; break;
default:
assert(0);
break;
} }
sam3_sprintf(pChip, "(%s)\n", cp); sam3_sprintf(pChip, "(%s)\n", cp);
fin = fin / pdiv; fin = fin / pdiv;