Caps lock now works as caps lock, not as shift lock. This new design will allow implementing a working tty, such that stdin is the only way to access the keyboard, instead of the current hacky way of using a special system call to read from the keyboard. Added a new system header file <sys/keycodes.h> defining the constants for every key on the keyboard. This will be used in future APIs. The main change is to split the keyboard driver into a class that reads from the keyboard, while another class handles the translation into printable characters (if possible). This allows a terminal driver based on logical key presses and printable characters, instead of a terminal driver based only on unicode-ish codes.
70 lines
1.7 KiB
C++
70 lines
1.7 KiB
C++
/******************************************************************************
|
|
|
|
COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011, 2012.
|
|
|
|
This file is part of Sortix.
|
|
|
|
Sortix is free software: you can redistribute it and/or modify it under the
|
|
terms of the GNU General Public License as published by the Free Software
|
|
Foundation, either version 3 of the License, or (at your option) any later
|
|
version.
|
|
|
|
Sortix is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
details.
|
|
|
|
You should have received a copy of the GNU General Public License along
|
|
with Sortix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
kb/ps2.h
|
|
A driver for the PS2 Keyboard.
|
|
|
|
******************************************************************************/
|
|
|
|
#ifndef SORTIX_KB_PS2_H
|
|
#define SORTIX_KB_PS2_H
|
|
|
|
#include "../keyboard.h"
|
|
|
|
namespace Sortix
|
|
{
|
|
class PS2Keyboard : public Keyboard
|
|
{
|
|
public:
|
|
PS2Keyboard(uint16_t iobase, uint8_t interrupt);
|
|
virtual ~PS2Keyboard();
|
|
virtual int Read();
|
|
virtual size_t GetPending() const;
|
|
virtual bool HasPending() const;
|
|
virtual void SetOwner(KeyboardOwner* owner, void* user);
|
|
|
|
public:
|
|
void OnInterrupt(CPU::InterruptRegisters* regs);
|
|
|
|
private:
|
|
uint8_t PopScancode();
|
|
int DecodeScancode(uint8_t scancode);
|
|
void UpdateLEDs(int ledval);
|
|
bool PushKey(int key);
|
|
int PopKey();
|
|
void NotifyOwner();
|
|
|
|
private:
|
|
int* queue;
|
|
size_t queuelength;
|
|
size_t queueoffset;
|
|
size_t queueused;
|
|
KeyboardOwner* owner;
|
|
void* ownerptr;
|
|
uint16_t iobase;
|
|
uint8_t interrupt;
|
|
bool scancodeescaped;
|
|
uint8_t leds;
|
|
|
|
};
|
|
}
|
|
|
|
#endif
|
|
|