Tue, 01 Mar 2011 21:33:32 +0000
Add keyboard patch from Andrew Warkentin <andreww591 gmail com>
I fixed the keyboard in FreeBee. I looked at the keyboard driver source available on a few sites, and it appears that BEGKBD/KEY_BEGIN_KEYBOARD is only supposed to be sent after the end of mouse data, and that KLAST/KEY_LIST_END is not a separate code, but a flag that is set on the last non-KALLUP/KEY_ALL_UP code in a list. I have attached a patch that implements these changes. I have also attached a patch that adds the 60Hz timer interrupt (I'm not sure if it's totally correct, though, since the cursor blinks rather slowly).
Received-From: Andrew Warkentin <andreww591 gmail com>
Signed-Off-By: Philip Pemberton <philpem@philpem.me.uk>
philpem@18 | 1 | #define _STATE_C |
philpem@18 | 2 | #include <stddef.h> |
philpem@18 | 3 | #include <malloc.h> |
philpem@18 | 4 | #include <stdio.h> |
philpem@52 | 5 | #include "wd279x.h" |
philpem@80 | 6 | #include "keyboard.h" |
philpem@18 | 7 | #include "state.h" |
philpem@18 | 8 | |
philpem@62 | 9 | int state_init(size_t base_ram_size, size_t exp_ram_size) |
philpem@18 | 10 | { |
philpem@18 | 11 | // Free RAM if it's allocated |
philpem@60 | 12 | if (state.base_ram != NULL) |
philpem@60 | 13 | free(state.base_ram); |
philpem@62 | 14 | if (state.exp_ram != NULL) |
philpem@62 | 15 | free(state.exp_ram); |
philpem@18 | 16 | |
philpem@18 | 17 | // Initialise hardware registers |
philpem@18 | 18 | state.romlmap = false; |
philpem@75 | 19 | state.idmarw = state.dmaen = state.dmaenb = false; |
philpem@75 | 20 | state.dma_count = state.dma_address = 0; |
philpem@75 | 21 | state.pie = 0; |
philpem@75 | 22 | state.leds = 0; |
philpem@75 | 23 | state.genstat = 0; // FIXME: check this |
philpem@75 | 24 | state.bsr0 = state.bsr1 = 0; // FIXME: check this |
philpem@18 | 25 | |
philpem@62 | 26 | // Allocate Base RAM, making sure the user has specified a valid RAM amount first |
philpem@62 | 27 | // Basically: 512KiB minimum, 2MiB maximum, in increments of 512KiB. |
philpem@62 | 28 | if ((base_ram_size < 512*1024) || (base_ram_size > 2048*1024) || ((base_ram_size % (512*1024)) != 0)) |
philpem@18 | 29 | return -1; |
philpem@62 | 30 | state.base_ram = malloc(base_ram_size); |
philpem@60 | 31 | if (state.base_ram == NULL) |
philpem@18 | 32 | return -2; |
philpem@62 | 33 | state.base_ram_size = base_ram_size; |
philpem@62 | 34 | |
philpem@62 | 35 | // Now allocate expansion RAM |
philpem@62 | 36 | // The difference here is that we can have zero bytes of Expansion RAM; we're not limited to having a minimum of 512KiB. |
philpem@62 | 37 | if ((exp_ram_size > 2048*1024) || ((exp_ram_size % (512*1024)) != 0)) |
philpem@62 | 38 | return -1; |
philpem@62 | 39 | state.exp_ram = malloc(exp_ram_size); |
philpem@62 | 40 | if (state.exp_ram == NULL) |
philpem@62 | 41 | return -2; |
philpem@62 | 42 | state.exp_ram_size = exp_ram_size; |
philpem@18 | 43 | |
philpem@18 | 44 | // Load ROMs |
philpem@18 | 45 | FILE *r14c, *r15c; |
philpem@18 | 46 | r14c = fopen("roms/14c.bin", "rb"); |
philpem@55 | 47 | if (r14c == NULL) { |
philpem@55 | 48 | fprintf(stderr, "[state] Error loading roms/14c.bin.\n"); |
philpem@55 | 49 | return -3; |
philpem@55 | 50 | } |
philpem@18 | 51 | r15c = fopen("roms/15c.bin", "rb"); |
philpem@55 | 52 | if (r15c == NULL) { |
philpem@55 | 53 | fprintf(stderr, "[state] Error loading roms/15c.bin.\n"); |
philpem@55 | 54 | return -3; |
philpem@55 | 55 | } |
philpem@18 | 56 | |
philpem@18 | 57 | // get ROM file size |
philpem@18 | 58 | fseek(r14c, 0, SEEK_END); |
philpem@18 | 59 | size_t romlen = ftell(r14c); |
philpem@18 | 60 | fseek(r14c, 0, SEEK_SET); |
philpem@18 | 61 | fseek(r15c, 0, SEEK_END); |
philpem@18 | 62 | size_t romlen2 = ftell(r15c); |
philpem@18 | 63 | fseek(r15c, 0, SEEK_SET); |
philpem@55 | 64 | if (romlen2 != romlen) { |
philpem@55 | 65 | fprintf(stderr, "[state] ROMs are not the same size!\n"); |
philpem@55 | 66 | return -3; |
philpem@55 | 67 | } |
philpem@55 | 68 | if ((romlen + romlen2) > ROM_SIZE) { |
philpem@55 | 69 | fprintf(stderr, "[state] ROM files are too large!\n"); |
philpem@55 | 70 | return -3; |
philpem@55 | 71 | } |
philpem@18 | 72 | |
philpem@18 | 73 | // sanity checks completed; load the ROMs! |
philpem@18 | 74 | uint8_t *romdat1, *romdat2; |
philpem@18 | 75 | romdat1 = malloc(romlen); |
philpem@18 | 76 | romdat2 = malloc(romlen2); |
philpem@18 | 77 | fread(romdat1, 1, romlen, r15c); |
philpem@18 | 78 | fread(romdat2, 1, romlen2, r14c); |
philpem@18 | 79 | |
philpem@18 | 80 | // convert the ROM data |
philpem@18 | 81 | for (size_t i=0; i<(romlen + romlen2); i+=2) { |
philpem@18 | 82 | state.rom[i+0] = romdat1[i/2]; |
philpem@18 | 83 | state.rom[i+1] = romdat2[i/2]; |
philpem@18 | 84 | } |
philpem@18 | 85 | |
philpem@18 | 86 | // TODO: if ROM buffer not filled, repeat the ROM data we read until it is (wraparound emulation) |
philpem@18 | 87 | |
philpem@18 | 88 | // free the data arrays and close the files |
philpem@18 | 89 | free(romdat1); |
philpem@18 | 90 | free(romdat2); |
philpem@18 | 91 | fclose(r14c); |
philpem@18 | 92 | fclose(r15c); |
philpem@18 | 93 | |
philpem@52 | 94 | // Initialise the disc controller |
philpem@52 | 95 | wd2797_init(&state.fdc_ctx); |
philpem@80 | 96 | // Initialise the keyboard controller |
philpem@80 | 97 | keyboard_init(&state.kbd); |
philpem@52 | 98 | |
philpem@18 | 99 | return 0; |
philpem@18 | 100 | } |
philpem@18 | 101 | |
philpem@18 | 102 | void state_done() |
philpem@18 | 103 | { |
philpem@60 | 104 | if (state.base_ram != NULL) { |
philpem@60 | 105 | free(state.base_ram); |
philpem@60 | 106 | state.base_ram = NULL; |
philpem@18 | 107 | } |
philpem@62 | 108 | |
philpem@62 | 109 | if (state.exp_ram != NULL) { |
philpem@62 | 110 | free(state.exp_ram); |
philpem@62 | 111 | state.exp_ram = NULL; |
philpem@62 | 112 | } |
philpem@62 | 113 | |
philpem@52 | 114 | // Deinitialise the disc controller |
philpem@52 | 115 | wd2797_done(&state.fdc_ctx); |
philpem@18 | 116 | } |
philpem@18 | 117 | |
philpem@18 | 118 |