6502/rk65c02
1
0
Fork 0
mirror of https://github.com/rkujawa/rk65c02.git synced 2024-12-12 10:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Further adjustments to get device subsystem working.

Browse Source
This commit is contained in:
Radosław Kujawa 2017-02-20 21:29:52 +01:00
parent 5cec9a9784
commit 43e38e567d
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/bus.c
View File

@ -1,11 +1,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
//#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
//#include <string.h> #include <fcntl.h>
//#include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
@ -25,11 +24,25 @@ bus_device_add(bus_t *b, device_t *d, uint16_t addr)
dm = (device_mapping_t *) malloc(sizeof(device_mapping_t)); dm = (device_mapping_t *) malloc(sizeof(device_mapping_t));
dm->dev = d; dm->dev = d;
/* TODO: check if addr + size is not bigger than RK65C02_BUS_SIZE */
dm->addr = addr; dm->addr = addr;
LL_APPEND((b->dm_head), dm); LL_APPEND((b->dm_head), dm);
} }
void
bus_device_dump(bus_t *b)
{
device_mapping_t *dm;
device_t *d;
LL_FOREACH(b->dm_head, dm) {
d = dm->dev;
printf("@ %x size %x - %s\n", dm->addr, d->size, d->name);
/* TODO: device specific info */
}
}
uint8_t uint8_t
bus_read_1(bus_t *t, uint16_t addr) bus_read_1(bus_t *t, uint16_t addr)
{ {
@ -49,7 +62,7 @@ bus_read_1(bus_t *t, uint16_t addr)
*/ */
} }
printf("bus READ @ %x value %x\n", addr, val); // printf("bus READ @ %x value %x\n", addr, val);
return val; return val;
} }
@ -71,7 +84,7 @@ bus_write_1(bus_t *t, uint16_t addr, uint8_t val)
*/ */
} }
printf("bus WRITE @ %x value %x\n", addr, val); // printf("bus WRITE @ %x value %x\n", addr, val);
} }
bus_t bus_t
@ -106,13 +119,14 @@ bus_load_buf(bus_t *t, uint16_t addr, uint8_t *buf, uint16_t bufsize)
// XXX: add sanity checks // XXX: add sanity checks
while (i < bufsize) { while (i < bufsize) {
bus_write_1(t, i, buf[i]); // XXX: overflow addr bus_write_1(t, addr+i, buf[i]); // XXX: overflow addr
i++; i++;
} }
return true; return true;
} }
/*
/* TODO: should be moved to ram/rom specific devs */
bool bool
bus_load_file(bus_t *t, uint16_t addr, const char *filename) bus_load_file(bus_t *t, uint16_t addr, const char *filename)
{ {
@ -126,20 +140,19 @@ bus_load_file(bus_t *t, uint16_t addr, const char *filename)
} }
while ((read(fd, &data, 1)) > 0) { while ((read(fd, &data, 1)) > 0) {
t->space[addr++] = data; // XXX: overflow addr bus_write_1(t, addr++, data); // XXX: overflow addr
} }
close(fd); close(fd);
return true; return true;
} }
*/
void void
bus_finish(bus_t *t) bus_finish(bus_t *t)
{ {
assert(t != NULL); assert(t != NULL);
// assert(t->space != NULL);
// free(t->space); /* TODO: foreach devices free 'em */
} }

6
src/bus.h
View File

@ -17,9 +17,13 @@ typedef struct bus_tag bus_t;
uint8_t bus_read_1(bus_t *, uint16_t); uint8_t bus_read_1(bus_t *, uint16_t);
void bus_write_1(bus_t *, uint16_t, uint8_t); void bus_write_1(bus_t *, uint16_t, uint8_t);
bus_t bus_init(); bus_t bus_init();
bus_t bus_init_with_default_devs();
void bus_finish(bus_t *); void bus_finish(bus_t *);
//bool bus_load_file(bus_t *, uint16_t, const char *); bool bus_load_file(bus_t *, uint16_t, const char *);
bool bus_load_buf(bus_t *, uint16_t, uint8_t *, uint16_t); bool bus_load_buf(bus_t *, uint16_t, uint8_t *, uint16_t);
void bus_device_add(bus_t *, device_t *, uint16_t);
void bus_device_dump(bus_t *);
#endif /* _BUS_H_ */ #endif /* _BUS_H_ */