#define PXAKBD_MAXROW 8
#define PXAKBD_MAXCOL 8
-struct pxa2xx_keypad_s{
- target_phys_addr_t base;
+struct PXA2xxKeyPadState {
qemu_irq irq;
struct keymap *map;
+ int pressed_cnt;
+ int alt_code;
uint32_t kpc;
uint32_t kpdk;
uint32_t kprec;
uint32_t kpmk;
uint32_t kpas;
- uint32_t kpasmkp0;
- uint32_t kpasmkp1;
- uint32_t kpasmkp2;
- uint32_t kpasmkp3;
+ uint32_t kpasmkp[4];
uint32_t kpkdi;
};
-static void pxa27x_keyboard_event (struct pxa2xx_keypad_s *kp, int keycode)
+static void pxa27x_keypad_find_pressed_key(PXA2xxKeyPadState *kp, int *row, int *col)
{
- int row, col,rel;
+ int i;
+ for (i = 0; i < 4; i++)
+ {
+ *col = i * 2;
+ for (*row = 0; *row < 8; (*row)++) {
+ if (kp->kpasmkp[i] & (1 << *row))
+ return;
+ }
+ *col = i * 2 + 1;
+ for (*row = 0; *row < 8; (*row)++) {
+ if (kp->kpasmkp[i] & (1 << (*row + 16)))
+ return;
+ }
+ }
+}
+
+static void pxa27x_keyboard_event (PXA2xxKeyPadState *kp, int keycode)
+{
+ int row, col, rel, assert_irq = 0;
+ uint32_t val;
+
+ if (keycode == 0xe0) {
+ kp->alt_code = 1;
+ return;
+ }
if(!(kp->kpc & KPC_ME)) /* skip if not enabled */
return;
rel = (keycode & 0x80) ? 1 : 0; /* key release from qemu */
keycode &= ~(0x80); /* strip qemu key release bit */
+ if (kp->alt_code) {
+ keycode |= 0x80;
+ kp->alt_code = 0;
+ }
+
row = kp->map[keycode].row;
col = kp->map[keycode].column;
if(row == -1 || col == -1)
return;
- switch (col) {
- case 0:
- case 1:
- if(rel)
- kp->kpasmkp0 = ~(0xffffffff);
- else
- kp->kpasmkp0 |= KPASMKPx_MKC(row,col);
- break;
- case 2:
- case 3:
- if(rel)
- kp->kpasmkp1 = ~(0xffffffff);
- else
- kp->kpasmkp1 |= KPASMKPx_MKC(row,col);
- break;
- case 4:
- case 5:
- if(rel)
- kp->kpasmkp2 = ~(0xffffffff);
- else
- kp->kpasmkp2 |= KPASMKPx_MKC(row,col);
- break;
- case 6:
- case 7:
- if(rel)
- kp->kpasmkp3 = ~(0xffffffff);
- else
- kp->kpasmkp3 |= KPASMKPx_MKC(row,col);
- break;
- } /* switch */
+
+ val = KPASMKPx_MKC(row, col);
+ if (rel) {
+ if (kp->kpasmkp[col / 2] & val) {
+ kp->kpasmkp[col / 2] &= ~val;
+ kp->pressed_cnt--;
+ assert_irq = 1;
+ }
+ } else {
+ if (!(kp->kpasmkp[col / 2] & val)) {
+ kp->kpasmkp[col / 2] |= val;
+ kp->pressed_cnt++;
+ assert_irq = 1;
+ }
+ }
+ kp->kpas = ((kp->pressed_cnt & 0x1f) << 26) | (0xf << 4) | 0xf;
+ if (kp->pressed_cnt == 1) {
+ kp->kpas &= ~((0xf << 4) | 0xf);
+ if (rel)
+ pxa27x_keypad_find_pressed_key(kp, &row, &col);
+ kp->kpas |= ((row & 0xf) << 4) | (col & 0xf);
+ }
goto out;
}
return;
out:
- if(kp->kpc & KPC_MIE) {
+ if (assert_irq && (kp->kpc & KPC_MIE)) {
kp->kpc |= KPC_MI;
qemu_irq_raise(kp->irq);
}
static uint32_t pxa2xx_keypad_read(void *opaque, target_phys_addr_t offset)
{
- struct pxa2xx_keypad_s *s = (struct pxa2xx_keypad_s *) opaque;
+ PXA2xxKeyPadState *s = (PXA2xxKeyPadState *) opaque;
uint32_t tmp;
- offset -= s->base;
switch (offset) {
case KPC:
return s->kpas;
break;
case KPASMKP0:
- return s->kpasmkp0;
+ return s->kpasmkp[0];
break;
case KPASMKP1:
- return s->kpasmkp1;
+ return s->kpasmkp[1];
break;
case KPASMKP2:
- return s->kpasmkp2;
+ return s->kpasmkp[2];
break;
case KPASMKP3:
- return s->kpasmkp3;
+ return s->kpasmkp[3];
break;
case KPKDI:
return s->kpkdi;
break;
default:
- cpu_abort(cpu_single_env, "%s: Bad offset " REG_FMT "\n",
- __FUNCTION__, offset);
+ hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset);
}
return 0;
static void pxa2xx_keypad_write(void *opaque,
target_phys_addr_t offset, uint32_t value)
{
- struct pxa2xx_keypad_s *s = (struct pxa2xx_keypad_s *) opaque;
- offset -= s->base;
+ PXA2xxKeyPadState *s = (PXA2xxKeyPadState *) opaque;
switch (offset) {
case KPC:
s->kpas = value;
break;
case KPASMKP0:
- s->kpasmkp0 = value;
+ s->kpasmkp[0] = value;
break;
case KPASMKP1:
- s->kpasmkp1 = value;
+ s->kpasmkp[1] = value;
break;
case KPASMKP2:
- s->kpasmkp2 = value;
+ s->kpasmkp[2] = value;
break;
case KPASMKP3:
- s->kpasmkp3 = value;
+ s->kpasmkp[3] = value;
break;
case KPKDI:
s->kpkdi = value;
break;
default:
- cpu_abort(cpu_single_env, "%s: Bad offset " REG_FMT "\n",
- __FUNCTION__, offset);
+ hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset);
}
}
-static CPUReadMemoryFunc *pxa2xx_keypad_readfn[] = {
+static CPUReadMemoryFunc * const pxa2xx_keypad_readfn[] = {
pxa2xx_keypad_read,
pxa2xx_keypad_read,
pxa2xx_keypad_read
};
-static CPUWriteMemoryFunc *pxa2xx_keypad_writefn[] = {
+static CPUWriteMemoryFunc * const pxa2xx_keypad_writefn[] = {
pxa2xx_keypad_write,
pxa2xx_keypad_write,
pxa2xx_keypad_write
};
-static void pxa2xx_keypad_save(QEMUFile *f, void *opaque)
-{
- struct pxa2xx_keypad_s *s = (struct pxa2xx_keypad_s *) opaque;
-
- qemu_put_be32s(f, &s->kpc);
- qemu_put_be32s(f, &s->kpdk);
- qemu_put_be32s(f, &s->kprec);
- qemu_put_be32s(f, &s->kpmk);
- qemu_put_be32s(f, &s->kpas);
- qemu_put_be32s(f, &s->kpasmkp0);
- qemu_put_be32s(f, &s->kpasmkp1);
- qemu_put_be32s(f, &s->kpasmkp2);
- qemu_put_be32s(f, &s->kpasmkp3);
- qemu_put_be32s(f, &s->kpkdi);
-
-}
-
-static int pxa2xx_keypad_load(QEMUFile *f, void *opaque, int version_id)
-{
- struct pxa2xx_keypad_s *s = (struct pxa2xx_keypad_s *) opaque;
-
- qemu_get_be32s(f, &s->kpc);
- qemu_get_be32s(f, &s->kpdk);
- qemu_get_be32s(f, &s->kprec);
- qemu_get_be32s(f, &s->kpmk);
- qemu_get_be32s(f, &s->kpas);
- qemu_get_be32s(f, &s->kpasmkp0);
- qemu_get_be32s(f, &s->kpasmkp1);
- qemu_get_be32s(f, &s->kpasmkp2);
- qemu_get_be32s(f, &s->kpasmkp3);
- qemu_get_be32s(f, &s->kpkdi);
-
- return 0;
-}
+static const VMStateDescription vmstate_pxa2xx_keypad = {
+ .name = "pxa2xx_keypad",
+ .version_id = 0,
+ .minimum_version_id = 0,
+ .minimum_version_id_old = 0,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(kpc, PXA2xxKeyPadState),
+ VMSTATE_UINT32(kpdk, PXA2xxKeyPadState),
+ VMSTATE_UINT32(kprec, PXA2xxKeyPadState),
+ VMSTATE_UINT32(kpmk, PXA2xxKeyPadState),
+ VMSTATE_UINT32(kpas, PXA2xxKeyPadState),
+ VMSTATE_UINT32_ARRAY(kpasmkp, PXA2xxKeyPadState, 4),
+ VMSTATE_UINT32(kpkdi, PXA2xxKeyPadState),
+ VMSTATE_END_OF_LIST()
+ }
+};
-struct pxa2xx_keypad_s *pxa27x_keypad_init(target_phys_addr_t base,
+PXA2xxKeyPadState *pxa27x_keypad_init(target_phys_addr_t base,
qemu_irq irq)
{
int iomemtype;
- struct pxa2xx_keypad_s *s;
+ PXA2xxKeyPadState *s;
- s = (struct pxa2xx_keypad_s *) qemu_mallocz(sizeof(struct pxa2xx_keypad_s));
- s->base = base;
+ s = (PXA2xxKeyPadState *) qemu_mallocz(sizeof(PXA2xxKeyPadState));
s->irq = irq;
- iomemtype = cpu_register_io_memory(0, pxa2xx_keypad_readfn,
- pxa2xx_keypad_writefn, s);
+ iomemtype = cpu_register_io_memory(pxa2xx_keypad_readfn,
+ pxa2xx_keypad_writefn, s, DEVICE_NATIVE_ENDIAN);
cpu_register_physical_memory(base, 0x00100000, iomemtype);
- register_savevm("pxa2xx_keypad", 0, 0,
- pxa2xx_keypad_save, pxa2xx_keypad_load, s);
+ vmstate_register(NULL, 0, &vmstate_pxa2xx_keypad, s);
return s;
}
-void pxa27x_register_keypad(struct pxa2xx_keypad_s *kp, struct keymap *map,
+void pxa27x_register_keypad(PXA2xxKeyPadState *kp, struct keymap *map,
int size)
{
- kp->map = (struct keymap *) qemu_mallocz(sizeof(struct keymap) * size);
-
if(!map || size < 0x80) {
fprintf(stderr, "%s - No PXA keypad map defined\n", __FUNCTION__);
exit(-1);
projects / qemu.git / blobdiff