| 26,7 → 26,7 |
|---|
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| |
| /** @addtogroup mips32 |
| /** @addtogroup mips32 |
| * @{ |
| */ |
| /** @file |
| 33,22 → 33,17 |
|---|
| */ |
| |
| #include <interrupt.h> |
| #include <ipc/irq.h> |
| #include <console/chardev.h> |
| #include <arch/drivers/msim.h> |
| #include <arch/cp0.h> |
| #include <console/console.h> |
| #include <sysinfo/sysinfo.h> |
| #include <ddi/ddi.h> |
| |
| /** Address of devices. */ |
| #define MSIM_VIDEORAM 0xB0000000 |
| #define MSIM_KBD_ADDRESS 0xB0000000 |
| #define MSIM_KBD_IRQ 2 |
| |
| static chardev_t console; |
| static irq_t msim_irq; |
| |
| static void msim_write(chardev_t *dev, const char ch); |
| static void msim_write(chardev_t *dev, const char ch, bool silent); |
| static void msim_enable(chardev_t *dev); |
| static void msim_disable(chardev_t *dev); |
| static char msim_do_read(chardev_t *dev); |
| 61,9 → 56,10 |
|---|
| }; |
| |
| /** Putchar that works with MSIM & gxemul */ |
| void msim_write(chardev_t *dev, const char ch) |
| void msim_write(chardev_t *dev, const char ch, bool silent) |
| { |
| *((char *) MSIM_VIDEORAM) = ch; |
| if (!silent) |
| *((char *) MSIM_VIDEORAM) = ch; |
| } |
| |
| /* Called from getc(). */ |
| 78,12 → 74,11 |
|---|
| cp0_mask_int(MSIM_KBD_IRQ); |
| } |
| |
| #include <print.h> |
| /** Read character using polling, assume interrupts disabled */ |
| static char msim_do_read(chardev_t *dev) |
| { |
| char ch; |
| |
| |
| while (1) { |
| ch = *((volatile char *) MSIM_KBD_ADDRESS); |
| if (ch) { |
| 97,23 → 92,19 |
|---|
| } |
| |
| /** Process keyboard interrupt. */ |
| static void msim_irq_handler(irq_t *irq, void *arg, ...) |
| static void msim_irq_handler(irq_t *irq) |
| { |
| if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox)) |
| ipc_irq_send_notif(irq); |
| else { |
| char ch = 0; |
| char ch = 0; |
| |
| ch = *((char *) MSIM_KBD_ADDRESS); |
| if (ch =='\r') |
| ch = '\n'; |
| if (ch == 0x7f) |
| ch = '\b'; |
| chardev_push_character(&console, ch); |
| } |
| ch = *((char *) MSIM_KBD_ADDRESS); |
| if (ch =='\r') |
| ch = '\n'; |
| if (ch == 0x7f) |
| ch = '\b'; |
| chardev_push_character(&console, ch); |
| } |
| |
| static irq_ownership_t msim_claim(void) |
| static irq_ownership_t msim_claim(irq_t *irq) |
| { |
| return IRQ_ACCEPT; |
| } |
| 158,6 → 149,10 |
|---|
| sysinfo_set_item_val("kbd.devno", NULL, devno); |
| sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ); |
| sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS); |
| |
| sysinfo_set_item_val("fb", NULL, true); |
| sysinfo_set_item_val("fb.kind", NULL, 3); |
| sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(MSIM_VIDEORAM)); |
| } |
| |
| /** @} |