49c49
< #include "dev/ps2.hh"
---
> #include "dev/ps2/types.hh"
52,53d51
< const uint8_t PS2TouchKit::ID[] = {0x00};
<
85c83
< case Ps2::Ps2Reset:
---
> case Ps2::Reset:
93,95c91
< case Ps2::SetResolution:
< case Ps2::SetRate:
< case Ps2::SetStatusLed:
---
> case Ps2::ReadID:
97,101c93
< return data.size() == 2;
<
< case Ps2::ReadId:
< sendAck();
< send((const uint8_t *)&ID, sizeof(ID));
---
> send(Ps2::Mouse::ID);
104,117d95
< case Ps2::TpReadId:
< // We're not a trackpoint device, this should make the probe
< // go away
< sendAck();
< send(0);
< send(0);
< sendAck();
< return true;
<
< case Ps2::SetScaling1_1:
< case Ps2::SetScaling1_2:
< sendAck();
< return true;
<
130c108
< case Ps2::SetDefaults:
---
> case Ps2::DefaultsAndDisable:
136c114,115
< case Ps2::StatusRequest:
---
> case Ps2::Mouse::Scale1to1:
> case Ps2::Mouse::Scale2to1:
137a117,125
> return true;
>
> case Ps2::Mouse::SetResolution:
> case Ps2::Mouse::SampleRate:
> sendAck();
> return data.size() == 2;
>
> case Ps2::Mouse::GetStatus:
> sendAck();
143c131,140
< case Ps2::TouchKitId:
---
> case TpReadId:
> // We're not a trackpoint device, this should make the probe
> // go away
> sendAck();
> send(0);
> send(0);
> sendAck();
> return true;
>
> case TouchKitDiag:
158c155
< assert(data[0] == Ps2::TouchKitId);
---
> assert(data[0] == TouchKitDiag);
184c181
< send(Ps2::TouchKitId);
---
> send(TouchKitDiag);