Mouse type now configurable

This commit is contained in:
SarahW 2016-12-16 20:19:08 +00:00
commit 09dbd1dd65
21 changed files with 494 additions and 238 deletions

View file

@ -4,17 +4,25 @@
#include "serial.h"
#include "timer.h"
static int oldb=0;
void mouse_serial_poll(int x, int y, int b)
typedef struct mouse_serial_t
{
uint8_t mousedat[3];
if (!(serial1.ier & 1))
return;
if (!x && !y && b==oldb) return;
int mousepos, mousedelay;
int oldb;
SERIAL *serial;
} mouse_serial_t;
oldb=b;
void mouse_serial_poll(int x, int y, int b, void *p)
{
mouse_serial_t *mouse = (mouse_serial_t *)p;
SERIAL *serial = mouse->serial;
uint8_t mousedat[3];
if (!(serial->ier & 1))
return;
if (!x && !y && b == mouse->oldb)
return;
mouse->oldb = b;
if (x>127) x=127;
if (y>127) y=127;
if (x<-128) x=-128;
@ -29,44 +37,62 @@ void mouse_serial_poll(int x, int y, int b)
mousedat[1]=x&0x3F;
mousedat[2]=y&0x3F;
if (!(serial1.mctrl&0x10))
if (!(serial->mctrl & 0x10))
{
pclog("Serial data %02X %02X %02X\n", mousedat[0], mousedat[1], mousedat[2]);
serial_write_fifo(&serial1, mousedat[0]);
serial_write_fifo(&serial1, mousedat[1]);
serial_write_fifo(&serial1, mousedat[2]);
// pclog("Serial data %02X %02X %02X\n", mousedat[0], mousedat[1], mousedat[2]);
serial_write_fifo(mouse->serial, mousedat[0]);
serial_write_fifo(mouse->serial, mousedat[1]);
serial_write_fifo(mouse->serial, mousedat[2]);
}
}
void mouse_serial_rcr(void *p)
void mouse_serial_rcr(SERIAL *serial, void *p)
{
mousepos=-1;
mousedelay=5000 * (1 << TIMER_SHIFT);
mouse_serial_t *mouse = (mouse_serial_t *)p;
mouse->mousepos = -1;
mouse->mousedelay = 5000 * (1 << TIMER_SHIFT);
}
void mousecallback(void *p)
{
SERIAL *serial = (SERIAL *)p;
mousedelay = 0;
if (mousepos == -1)
mouse_serial_t *mouse = (mouse_serial_t *)p;
mouse->mousedelay = 0;
if (mouse->mousepos == -1)
{
mousepos = 0;
/* serial_fifo_read = serial_fifo_write = 0;
serial.lsr &= ~1;*/
serial_write_fifo(serial, 'M');
mouse->mousepos = 0;
serial_write_fifo(mouse->serial, 'M');
}
/* else if (serial_fifo_read != serial_fifo_write)
{
serial.iir=4;
serial.lsr|=1;
if (serial.mctrl&8) picint(0x10);
}*/
}
void mouse_serial_init()
void *mouse_serial_init()
{
mouse_poll = mouse_serial_poll;
mouse_serial_t *mouse = (mouse_t *)malloc(sizeof(mouse_serial_t));
memset(mouse, 0, sizeof(mouse_serial_t));
mouse->serial = &serial1;
serial1.rcr_callback = mouse_serial_rcr;
timer_add(mousecallback, &mousedelay, &mousedelay, &serial1);
serial1.rcr_callback_p = mouse;
timer_add(mousecallback, &mouse->mousedelay, &mouse->mousedelay, mouse);
return mouse;
}
void mouse_serial_close(void *p)
{
mouse_serial_t *mouse = (mouse_serial_t *)p;
free(mouse);
serial1.rcr_callback = NULL;
}
mouse_t mouse_serial_microsoft =
{
"Microsoft 2-button mouse (serial)",
mouse_serial_init,
mouse_serial_close,
mouse_serial_poll,
MOUSE_TYPE_SERIAL
};