Commit 9107b779 authored by Dimitris Lampridis's avatar Dimitris Lampridis
Browse files

Merge branch 'master' into dlamprid-wrbtrain_vfchd

parents 03ec0963 0ac95da8
......@@ -238,10 +238,10 @@ int main(int argc, char **argv)
memset(mapp, 0, sizeof(*mapp));
mapp->am = VME_A32_USER_DATA_SCT;
mapp->data_width = VME_D32;
mapp->sizel = 0x80000;
mapp->vme_addrl = 0x4000000;
mapp->am = VME_A32_USER_DATA_SCT;
mapp->data_width = VME_D32;
mapp->sizel = 0x80000;
mapp->vme_addrl = atoi(argv[1]) << 24;
if ((vme_base_ptr = vme_map(mapp, 1)) == NULL) {
printf("could not map at 0x%08x\n", mapp->vme_addrl);
......@@ -251,7 +251,7 @@ int main(int argc, char **argv)
fprintf(stderr, "vme 0x%08x kernel %p user %p\n",
mapp->vme_addrl, mapp->kernel_va, mapp->user_va);
vfchd_eeprom_loader(argv[1]);
vfchd_eeprom_loader(argv[2]);
vme_unmap(mapp, 1);
......
......@@ -134,10 +134,10 @@ int main(int argc, char **argv)
memset(mapp, 0, sizeof(*mapp));
mapp->am = VME_A32_USER_DATA_SCT;
mapp->data_width = VME_D32;
mapp->sizel = 0x80000;
mapp->vme_addrl = 0x4000000;
mapp->am = VME_A32_USER_DATA_SCT;
mapp->data_width = VME_D32;
mapp->sizel = 0x80000;
mapp->vme_addrl = atoi(argv[1]) << 24;
if ((vme_base_ptr = vme_map(mapp, 1)) == NULL) {
printf("could not map at 0x%08x\n", mapp->vme_addrl);
......
......@@ -70,7 +70,7 @@ int main(int argc, char **argv)
mapp->am = VME_A32_USER_DATA_SCT;
mapp->data_width = VME_D32;
mapp->sizel = 0x80000;
mapp->vme_addrl = 0x4000000;
mapp->vme_addrl = atoi(argv[1]) << 24;
if ((vme_base_ptr = vme_map(mapp, 1)) == NULL) {
printf("could not map at 0x%08x\n", mapp->vme_addrl);
......@@ -81,7 +81,7 @@ int main(int argc, char **argv)
mapp->vme_addrl, mapp->kernel_va, mapp->user_va);
vfchd_wrc_loader(argv[1]);
vfchd_wrc_loader(argv[2]);
vme_unmap(mapp, 1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment