--- trunk/src/devices/dev_dreamcast_rtc.c 2007/10/08 16:21:17 34 +++ trunk/src/devices/dev_dreamcast_rtc.c 2007/10/08 16:22:32 42 @@ -25,9 +25,9 @@ * SUCH DAMAGE. * * - * $Id: dev_dreamcast_rtc.c,v 1.3 2007/02/03 20:14:23 debug Exp $ + * $Id: dev_dreamcast_rtc.c,v 1.4 2007/06/15 19:11:15 debug Exp $ * - * Dreamcast Real-Time Clock. + * COMMENT: Dreamcast Real-Time Clock * * Pretty basic; two 32-bit words at physical addresses 0x00710000 and * 0x00710004 hold the high and low 16-bit parts, respectively, of the @@ -58,8 +58,7 @@ DEVICE_ACCESS(dreamcast_rtc) { - /* struct dreamcast_rtc_data *d = - (struct dreamcast_rtc_data *) extra; */ + /* struct dreamcast_rtc_data *d = extra; */ uint64_t idata = 0, odata = 0; struct timeval tv; @@ -85,7 +84,8 @@ odata &= 0xffff; break; - default:if (writeflag == MEM_READ) { + default: + if (writeflag == MEM_READ) { fatal("[ dreamcast_rtc: read from addr 0x%x ]\n", (int)relative_addr); } else { @@ -103,16 +103,12 @@ DEVINIT(dreamcast_rtc) { - struct machine *machine = devinit->machine; - struct dreamcast_rtc_data *d = - malloc(sizeof(struct dreamcast_rtc_data)); - if (d == NULL) { - fprintf(stderr, "out of memory\n"); - exit(1); - } + struct dreamcast_rtc_data *d; + + CHECK_ALLOCATION(d = malloc(sizeof(struct dreamcast_rtc_data))); memset(d, 0, sizeof(struct dreamcast_rtc_data)); - memory_device_register(machine->memory, devinit->name, + memory_device_register(devinit->machine->memory, devinit->name, 0x00710000, 0x100, dev_dreamcast_rtc_access, d, DM_DEFAULT, NULL); return 1;