DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-19 17:26:31 +00:00
Code Issues Releases Wiki Activity

解决了一些小问题

Browse Source
This commit is contained in:
fslongjin
2022-03-18 19:18:36 +08:00
parent 75eea551e6
commit 71d6af78d8
12 changed files with 484 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
kernel/driver/keyboard/keyboard.c → kernel/driver/keyboard/ps2_keyboard.c
View File

@ -1,10 +1,10 @@
#include "keyboard.h"
#include "ps2_keyboard.h"
#include "../interrupt/apic/apic.h"
#include "../../mm/mm.h"
#include "../../mm/slab.h"
#include "../../common/printk.h"
static struct keyboard_input_buffer *kb_buf_ptr = NULL;
static struct ps2_keyboard_input_buffer *kb_buf_ptr = NULL;
// 功能键标志变量
static bool shift_l, shift_r, ctrl_l, ctrl_r, alt_l, alt_r;
@ -13,7 +13,7 @@ static bool kp_forward_slash, kp_en;
struct apic_IO_APIC_RTE_entry entry;
hardware_intr_controller keyboard_intr_controller =
hardware_intr_controller ps2_keyboard_intr_controller =
{
.enable = apic_ioapic_enable,
.disable = apic_ioapic_disable,
@ -30,19 +30,19 @@ hardware_intr_controller keyboard_intr_controller =
* @param param 参数
* @param regs 寄存器信息
*/
void keyboard_handler(ul irq_num, ul param, struct pt_regs *regs)
void ps2_keyboard_handler(ul irq_num, ul param, struct pt_regs *regs)
{
// 读取键盘输入的信息
unsigned char x = io_in8(PORT_KEYBOARD_DATA);
unsigned char x = io_in8(PORT_PS2_KEYBOARD_DATA);
// printk_color(ORANGE, BLACK, "key_pressed:%02x\n", x);
// 当头指针越过界时，恢复指向数组头部
if (kb_buf_ptr->ptr_head == kb_buf_ptr->buffer + keyboard_buffer_size)
if (kb_buf_ptr->ptr_head == kb_buf_ptr->buffer + ps2_keyboard_buffer_size)
kb_buf_ptr->ptr_head = kb_buf_ptr->buffer;
if (kb_buf_ptr->count >= keyboard_buffer_size)
if (kb_buf_ptr->count >= ps2_keyboard_buffer_size)
{
kwarn("Keyboard input buffer is full.");
kwarn("ps2_keyboard input buffer is full.");
return;
}
@ -54,24 +54,26 @@ void keyboard_handler(ul irq_num, ul param, struct pt_regs *regs)
* @brief 初始化键盘驱动程序的函数
*
*/
void keyboard_init()
void ps2_keyboard_init()
{
// 开启键盘中断，中断向量号为0x21，物理模式，投递至BSP处理器
apic_ioapic_write_rte(0x12, 0x21);
// ======= 初始化键盘循环队列缓冲区 ===========
// 申请键盘循环队列缓冲区的内存
kb_buf_ptr = (struct keyboard_input_buffer *)kmalloc(sizeof(struct keyboard_input_buffer), 0);
kb_buf_ptr = (struct ps2_keyboard_input_buffer *)kmalloc(sizeof(struct ps2_keyboard_input_buffer), 0);
kb_buf_ptr->ptr_head = kb_buf_ptr->buffer;
kb_buf_ptr->ptr_tail = kb_buf_ptr->buffer;
kb_buf_ptr->count = 0;
memset(kb_buf_ptr->buffer, 0, keyboard_buffer_size);
memset(kb_buf_ptr->buffer, 0, ps2_keyboard_buffer_size);
// ======== 初始化中断RTE entry ==========
entry.vector = KEYBOARD_INTR_VECTOR; // 设置中断向量号
entry.deliver_mode = IO_APIC_FIXED; // 投递模式：混合
entry.dest_mode = DEST_PHYSICAL; // 物理模式投递中断
entry.vector = PS2_KEYBOARD_INTR_VECTOR; // 设置中断向量号
entry.deliver_mode = IO_APIC_FIXED; // 投递模式：混合
entry.dest_mode = DEST_PHYSICAL; // 物理模式投递中断
entry.deliver_status = IDLE;
entry.trigger_mode = EDGE_TRIGGER; // 设置边沿触发
entry.polarity = POLARITY_HIGH; // 高电平触发
@ -84,11 +86,11 @@ void keyboard_init()
entry.destination.physical.phy_dest = 0; // 设置投递到BSP处理器
// ======== 初始化键盘控制器，写入配置值 =========
wait_keyboard_write();
io_out8(PORT_KEYBOARD_CONTROL, KEYBOARD_COMMAND_WRITE);
wait_keyboard_write();
io_out8(PORT_KEYBOARD_DATA, KEYBOARD_PARAM_INIT);
wait_keyboard_write();
wait_ps2_keyboard_write();
io_out8(PORT_PS2_KEYBOARD_CONTROL, PS2_KEYBOARD_COMMAND_WRITE);
wait_ps2_keyboard_write();
io_out8(PORT_PS2_KEYBOARD_DATA, PS2_KEYBOARD_PARAM_INIT);
wait_ps2_keyboard_write();
// 执行一百万次nop，等待键盘控制器把命令执行完毕
for (int i = 0; i < 1000; ++i)
@ -102,16 +104,17 @@ void keyboard_init()
alt_r = false;
// 注册中断处理程序
irq_register(KEYBOARD_INTR_VECTOR, &entry, &keyboard_handler, (ul)kb_buf_ptr, &keyboard_intr_controller, "ps/2 keyboard");
irq_register(PS2_KEYBOARD_INTR_VECTOR, &entry, &ps2_keyboard_handler, (ul)kb_buf_ptr, &ps2_keyboard_intr_controller, "ps/2 keyboard");
kdebug("kb registered.");
}
/**
* @brief 键盘驱动卸载函数
*
*/
void keyboard_exit()
void ps2_keyboard_exit()
{
irq_unregister(KEYBOARD_INTR_VECTOR);
irq_unregister(PS2_KEYBOARD_INTR_VECTOR);
kfree((ul *)kb_buf_ptr);
}
@ -119,11 +122,11 @@ void keyboard_exit()
* @brief 解析键盘扫描码
*
*/
void keyboard_analyze_keycode()
void ps2_keyboard_analyze_keycode()
{
bool flag_make = false;
int c = keyboard_get_scancode();
int c = ps2_keyboard_get_scancode();
// 循环队列为空
if (c == -1)
return;
@ -136,7 +139,7 @@ void keyboard_analyze_keycode()
key = PAUSE_BREAK;
// 清除缓冲区中剩下的扫描码
for (int i = 1; i < 6; ++i)
if (keyboard_get_scancode() != pause_break_scan_code[i])
if (ps2_keyboard_get_scancode() != pause_break_scan_code[i])
{
key = 0;
break;
@ -145,20 +148,20 @@ void keyboard_analyze_keycode()
else if (scancode == 0xE0) // 功能键, 有多个扫描码
{
// 获取下一个扫描码
scancode = keyboard_get_scancode();
scancode = ps2_keyboard_get_scancode();
switch (scancode)
{
case 0x2a: // print screen 按键被按下
if (keyboard_get_scancode() == 0xe0)
if (keyboard_get_scancode() == 0x37)
if (ps2_keyboard_get_scancode() == 0xe0)
if (ps2_keyboard_get_scancode() == 0x37)
{
key = PRINT_SCREEN;
flag_make = true;
}
break;
case 0xb7: // print screen 按键被松开
if (keyboard_get_scancode() == 0xe0)
if (keyboard_get_scancode() == 0xaa)
if (ps2_keyboard_get_scancode() == 0xe0)
if (ps2_keyboard_get_scancode() == 0xaa)
{
key = PRINT_SCREEN;
flag_make = false;
@ -353,13 +356,13 @@ void keyboard_analyze_keycode()
* @brief 从缓冲队列中获取键盘扫描码
*
*/
int keyboard_get_scancode()
int ps2_keyboard_get_scancode()
{
// 缓冲队列为空
if (kb_buf_ptr->count == 0)
return -1;
if (kb_buf_ptr->ptr_tail == kb_buf_ptr->buffer + keyboard_buffer_size)
if (kb_buf_ptr->ptr_tail == kb_buf_ptr->buffer + ps2_keyboard_buffer_size)
kb_buf_ptr->ptr_tail = kb_buf_ptr->buffer;
int ret = (int)(*(kb_buf_ptr->ptr_tail));

36
kernel/driver/keyboard/keyboard.h → kernel/driver/keyboard/ps2_keyboard.h
View File

@ -2,39 +2,39 @@
#include "../../common/glib.h"
#define KEYBOARD_INTR_VECTOR 0x21 // 键盘的中断向量号
#define PS2_KEYBOARD_INTR_VECTOR 0x21 // 键盘的中断向量号
// 定义键盘循环队列缓冲区大小为100bytes
#define keyboard_buffer_size 100
#define ps2_keyboard_buffer_size 100
/**
* @brief 键盘循环队列缓冲区结构体
*
*/
struct keyboard_input_buffer
struct ps2_keyboard_input_buffer
{
unsigned char *ptr_head;
unsigned char *ptr_tail;
int count;
unsigned char buffer[keyboard_buffer_size];
unsigned char buffer[ps2_keyboard_buffer_size];
};
#define PORT_KEYBOARD_DATA 0x60
#define PORT_KEYBOARD_STATUS 0x64
#define PORT_KEYBOARD_CONTROL 0x64
#define PORT_PS2_KEYBOARD_DATA 0x60
#define PORT_PS2_KEYBOARD_STATUS 0x64
#define PORT_PS2_KEYBOARD_CONTROL 0x64
#define KEYBOARD_COMMAND_WRITE 0x60 // 向键盘发送配置命令
#define KEYBOARD_COMMAND_READ 0x20 // 读取键盘的配置值
#define KEYBOARD_PARAM_INIT 0x47 // 初始化键盘控制器的配置值
#define PS2_KEYBOARD_COMMAND_WRITE 0x60 // 向键盘发送配置命令
#define PS2_KEYBOARD_COMMAND_READ 0x20 // 读取键盘的配置值
#define PS2_KEYBOARD_PARAM_INIT 0x47 // 初始化键盘控制器的配置值
// ========= 检测键盘控制器输入/输出缓冲区是否已满
#define KEYBOARD_FLAG_OUTBUF_FULL 0x01 // 键盘的输出缓冲区已满标志位
#define KEYBOARD_FLAG_INBUF_FULL 0x02 // 键盘的输入缓冲区已满标志位
#define PS2_KEYBOARD_FLAG_OUTBUF_FULL 0x01 // 键盘的输出缓冲区已满标志位
#define PS2_KEYBOARD_FLAG_INBUF_FULL 0x02 // 键盘的输入缓冲区已满标志位
// 等待向键盘控制器写入信息完成
#define wait_keyboard_write() while (io_in8(PORT_KEYBOARD_STATUS) & KEYBOARD_FLAG_INBUF_FULL)
#define wait_ps2_keyboard_write() while (io_in8(PORT_PS2_KEYBOARD_STATUS) & PS2_KEYBOARD_FLAG_INBUF_FULL)
// 等待从键盘控制器读取信息完成
#define wait_keyboard_read() while (io_in8(PORT_KEYBOARD_STATUS) & KEYBOARD_FLAG_OUTBUF_FULL)
#define wait_ps2_keyboard_read() while (io_in8(PORT_PS2_KEYBOARD_STATUS) & PS2_KEYBOARD_FLAG_OUTBUF_FULL)
// 128个按键, 每个按键包含普通按键和shift+普通按键两种状态
#define NUM_SCAN_CODES 0x80
@ -199,23 +199,23 @@ uint keycode_map_normal[NUM_SCAN_CODES*MAP_COLS] =
* @brief 初始化键盘驱动程序的函数
*
*/
void keyboard_init();
void ps2_keyboard_init();
/**
* @brief 键盘驱动卸载函数
*
*/
void keyboard_exit();
void ps2_keyboard_exit();
/**
* @brief 解析键盘扫描码
*
*/
void keyboard_analyze_keycode();
void ps2_keyboard_analyze_keycode();
/**
* @brief 从缓冲队列中获取键盘扫描码
* @return 键盘扫描码
* 若缓冲队列为空则返回-1
*/
int keyboard_get_scancode();
int ps2_keyboard_get_scancode();