sys64738
/
mspdebug
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #62 from tgtakaoka/fix-simio-timer 

Fix sim driver and simio_timer
This commit is contained in:
Daniel Beer 2018-07-01 08:46:09 +12:00 committed by GitHub
parent 4d3a437196 00fde4a2f2
commit 1b13979594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/sim.c
View File

@ -619,7 +619,7 @@ static int sim_readmem(device_t dev_base, address_t addr,
} }
/* Read word IO addresses */ /* Read word IO addresses */
while (len > 2 && (addr < 0x200)) { while (len >= 2 && addr < 0x200) {
uint16_t data = 0; uint16_t data = 0;
simio_read(addr, &data); simio_read(addr, &data);
@ -654,7 +654,14 @@ static int sim_writemem(device_t dev_base, address_t addr,
} }
/* Write word IO addresses */ /* Write word IO addresses */
while (len > 2 && (addr < 0x200)) { if (len == 1 && addr < 0x200) {
printc_err("sim: memory write on word IO, "
"at least 2 bytes data are necessary.\n");
} else if (len % 2 != 0 && addr < 0x200) {
printc_err("sim: memory write on word IO, "
"the last byte is ignored.\n");
}
while (len >= 2 && addr < 0x200) {
simio_write(addr, ((uint16_t)mem[1] << 8) | mem[0]); simio_write(addr, ((uint16_t)mem[1] << 8) | mem[0]);
mem += 2; mem += 2;
len -= 2; len -= 2;

11
simio/simio_timer.c
View File

@ -88,6 +88,7 @@ static struct simio_device *timer_create(char **arg_text)
size_text); size_text);
return NULL; return NULL;
} }
size = value;
if (size < 2 || size > MAX_CCRS) { if (size < 2 || size > MAX_CCRS) {
printc_err("timer: invalid size: %d\n", size); printc_err("timer: invalid size: %d\n", size);
@ -282,7 +283,7 @@ static int timer_info(struct simio_device *dev)
printc("\n"); printc("\n");
for (i = 0; i < tr->size; i++) for (i = 0; i < tr->size; i++)
printc("Channel %2d, TACTL = 0x%04x, TACCR = 0x%04x\n", printc("Channel %2d, TACCTL = 0x%04x, TACCR = 0x%04x\n",
i, tr->ctls[i], tr->ccrs[i]); i, tr->ctls[i], tr->ccrs[i]);
return 0; return 0;
@ -307,7 +308,7 @@ static int timer_write(struct simio_device *dev,
} }
if (addr >= tr->base_addr + 2 && if (addr >= tr->base_addr + 2 &&
addr < tr->base_addr + tr->size + 2) { addr < tr->base_addr + (tr->size << 1) + 2) {
int index = ((addr & 0xf) - 2) >> 1; int index = ((addr & 0xf) - 2) >> 1;
tr->ctls[index] = (data & 0xf9f7) | tr->ctls[index] = (data & 0xf9f7) |
@ -316,7 +317,7 @@ static int timer_write(struct simio_device *dev,
} }
if (addr >= tr->base_addr + 0x12 && if (addr >= tr->base_addr + 0x12 &&
addr < tr->base_addr + tr->size + 0x12) { addr < tr->base_addr + (tr->size << 1) + 0x12) {
int index = ((addr & 0xf) - 2) >> 1; int index = ((addr & 0xf) - 2) >> 1;
tr->ccrs[index] = data; tr->ccrs[index] = data;
@ -348,13 +349,13 @@ static int timer_read(struct simio_device *dev,
} }
if (addr >= tr->base_addr + 2 && if (addr >= tr->base_addr + 2 &&
addr < tr->base_addr + tr->size + 2) { addr < tr->base_addr + (tr->size << 1) + 2) {
*data = tr->ctls[((addr & 0xf) - 2) >> 1]; *data = tr->ctls[((addr & 0xf) - 2) >> 1];
return 0; return 0;
} }
if (addr >= tr->base_addr + 0x12 && if (addr >= tr->base_addr + 0x12 &&
addr < tr->base_addr + tr->size + 0x12) { addr < tr->base_addr + (tr->size << 1) + 0x12) {
*data = tr->ccrs[((addr & 0xf) - 2) >> 1]; *data = tr->ccrs[((addr & 0xf) - 2) >> 1];
return 0; return 0;
} }