增加 usb 驱动, 更新内核模块接口, device新增卸载设备接口.

内核模块新增任务子系统接口.

Co-authored-by: suhuajun-github <115517663+suhuajun-github@users.noreply.github.com>

Author: xiaoyi1212

.github/workflows/main.yml

@@ -88,6 +88,8 @@ jobs:
           xmake build e1000
           xmake build extfs
           xmake build nvme
+          xmake build hid
+          xmake build xhci
           xmake build iso
           xmake build img
 

assets/initramfs.img

@@ -11,8 +11,10 @@ wallpaper: boot():/background.jpg
     module_path: boot():/extfs.km
     module_path: boot():/e1000.km
     module_path: boot():/nvme.km
+    module_path: boot():/hid.km
+    module_path: boot():/xhci.km
     module_path: boot():/initramfs.img
-    kernel_cmdline: console=default root=/dev/sata0p1 mem=default
+    kernel_cmdline: console=tty root=/dev/sata0p1 mem=default
     kaslr: no
 
 /CoolPotOS-CP_Kernel-i386

assets/limine.conf

@@ -10,6 +10,10 @@ typedef size_t          usize;
 typedef ssize_t         isize;
 typedef int             wchar_t;
 
+#define ABS(x)    ((x) > 0 ? (x) : -(x))
+#define MAX(x, y) ((x > y) ? (x) : (y))
+#define MIN(x, y) ((x < y) ? (x) : (y))
+
 typedef int pid_t;
 typedef int errno_t;
 
@@ -32,3 +36,11 @@ int    strcmp(const char *s1, const char *s2);
 int    strncmp(const char *s1, const char *s2, size_t n);
 int    sprintf(char *buf, char const *fmt, ...);
 int    snprintf(char *buf, int count, const char *fmt, ...);
+
+static inline void arch_enable_interrupt() {
+    __asm__ volatile("sti");
+}
+
+static inline void arch_disable_interrupt() {
+    __asm__ volatile("cli");
+}

assets/rootfs.tar.xz

@@ -1,5 +1,58 @@
 #pragma once
 
+// USB标准定义
+#define USB_DIR_OUT 0
+#define USB_DIR_IN  0x80
+
+#define USB_TYPE_STANDARD (0x00 << 5)
+#define USB_TYPE_CLASS    (0x01 << 5)
+#define USB_TYPE_VENDOR   (0x02 << 5)
+
+#define USB_RECIP_DEVICE    0x00
+#define USB_RECIP_INTERFACE 0x01
+#define USB_RECIP_ENDPOINT  0x02
+
+// 描述符类型
+#define USB_DT_DEVICE    0x01
+#define USB_DT_CONFIG    0x02
+#define USB_DT_STRING    0x03
+#define USB_DT_INTERFACE 0x04
+#define USB_DT_ENDPOINT  0x05
+
+// 端点类型
+#define USB_ENDPOINT_XFER_CONTROL 0
+#define USB_ENDPOINT_XFER_ISOC    1
+#define USB_ENDPOINT_XFER_BULK    2
+#define USB_ENDPOINT_XFER_INT     3
+
+// USB标准请求
+#define USB_REQ_GET_STATUS        0x00
+#define USB_REQ_CLEAR_FEATURE     0x01
+#define USB_REQ_SET_FEATURE       0x03
+#define USB_REQ_SET_ADDRESS       0x05
+#define USB_REQ_GET_DESCRIPTOR    0x06
+#define USB_REQ_SET_DESCRIPTOR    0x07
+#define USB_REQ_GET_CONFIGURATION 0x08
+#define USB_REQ_SET_CONFIGURATION 0x09
+#define USB_REQ_GET_INTERFACE     0x0A
+#define USB_REQ_SET_INTERFACE     0x0B
+
+// 设备速度
+#define USB_SPEED_UNKNOWN 0
+#define USB_SPEED_LOW     1
+#define USB_SPEED_FULL    2
+#define USB_SPEED_HIGH    3
+#define USB_SPEED_SUPER   4
+
+// USB设备状态
+#define USB_STATE_NOTATTACHED 0
+#define USB_STATE_ATTACHED    1
+#define USB_STATE_POWERED     2
+#define USB_STATE_DEFAULT     3
+#define USB_STATE_ADDRESS     4
+#define USB_STATE_CONFIGURED  5
+#define USB_STATE_SUSPENDED   6
+
 #include "cp_kernel.h"
 
 typedef errno_t (*netdev_send_t)(void *dev, void *data, uint32_t len);
@@ -64,6 +117,167 @@ typedef struct netdev {
     netdev_send_t send;
     netdev_recv_t recv;
 } netdev_t;
+// USB标准设备请求
+typedef struct {
+    uint8_t  bmRequestType;
+    uint8_t  bRequest;
+    uint16_t wValue;
+    uint16_t wIndex;
+    uint16_t wLength;
+} __attribute__((packed)) usb_device_request_t;
+
+// USB设备描述符
+typedef struct {
+    uint8_t  bLength;
+    uint8_t  bDescriptorType;
+    uint16_t bcdUSB;
+    uint8_t  bDeviceClass;
+    uint8_t  bDeviceSubClass;
+    uint8_t  bDeviceProtocol;
+    uint8_t  bMaxPacketSize0;
+    uint16_t idVendor;
+    uint16_t idProduct;
+    uint16_t bcdDevice;
+    uint8_t  iManufacturer;
+    uint8_t  iProduct;
+    uint8_t  iSerialNumber;
+    uint8_t  bNumConfigurations;
+} __attribute__((packed)) usb_device_descriptor_t;
+
+// USB配置描述符
+typedef struct {
+    uint8_t  bLength;
+    uint8_t  bDescriptorType;
+    uint16_t wTotalLength;
+    uint8_t  bNumInterfaces;
+    uint8_t  bConfigurationValue;
+    uint8_t  iConfiguration;
+    uint8_t  bmAttributes;
+    uint8_t  bMaxPower;
+} __attribute__((packed)) usb_config_descriptor_t;
+
+// USB接口描述符
+typedef struct {
+    uint8_t bLength;
+    uint8_t bDescriptorType;
+    uint8_t bInterfaceNumber;
+    uint8_t bAlternateSetting;
+    uint8_t bNumEndpoints;
+    uint8_t bInterfaceClass;
+    uint8_t bInterfaceSubClass;
+    uint8_t bInterfaceProtocol;
+    uint8_t iInterface;
+} __attribute__((packed)) usb_interface_descriptor_t;
+
+// USB端点描述符
+typedef struct {
+    uint8_t  bLength;
+    uint8_t  bDescriptorType;
+    uint8_t  bEndpointAddress;
+    uint8_t  bmAttributes;
+    uint16_t wMaxPacketSize;
+    uint8_t  bInterval;
+} __attribute__((packed)) usb_endpoint_descriptor_t;
+
+// 前向声明
+typedef struct usb_device   usb_device_t;
+typedef struct usb_endpoint usb_endpoint_t;
+typedef struct usb_transfer usb_transfer_t;
+typedef struct usb_hcd      usb_hcd_t;
+
+// USB传输完成回调
+typedef void (*usb_transfer_callback_t)(usb_transfer_t *transfer);
+
+// USB传输结构
+struct usb_transfer {
+    usb_device_t   *device;
+    usb_endpoint_t *endpoint;
+
+    void    *buffer;
+    uint32_t length;
+    uint32_t actual_length;
+
+    int   status;
+    void *hcd_private; // HCD私有数据
+
+    usb_transfer_callback_t callback;
+    void                   *user_data;
+
+    struct usb_transfer *next;
+};
+
+// USB端点结构
+struct usb_endpoint {
+    uint8_t  address;
+    uint8_t  attributes;
+    uint16_t max_packet_size;
+    uint8_t  interval;
+
+    usb_device_t *device;
+    void         *hcd_private;
+};
+
+// USB设备结构
+struct usb_device {
+    uint8_t port;
+
+    uint8_t address;
+    uint8_t speed;
+    uint8_t state;
+
+    usb_device_descriptor_t  descriptor;
+    usb_config_descriptor_t *config_descriptor;
+
+    uint8_t class;
+    uint8_t subclass;
+
+    usb_endpoint_t endpoints[32]; // 最多16 IN + 16 OUT
+
+    usb_hcd_t *hcd;
+    void      *hcd_private; // HCD私有数据
+
+    void *private_data;
+
+    struct usb_device *next;
+};
+
+// USB主机控制器驱动操作
+typedef struct {
+    int (*init)(usb_hcd_t *hcd);
+    int (*shutdown)(usb_hcd_t *hcd);
+
+    int (*reset_port)(usb_hcd_t *hcd, uint8_t port);
+    int (*enable_slot)(usb_hcd_t *hcd, usb_device_t *device);
+    int (*disable_slot)(usb_hcd_t *hcd, usb_device_t *device);
+
+    int (*address_device)(usb_hcd_t *hcd, usb_device_t *device, uint8_t address);
+    int (*configure_endpoint)(usb_hcd_t *hcd, usb_endpoint_t *endpoint);
+
+    int (*control_transfer)(usb_hcd_t *hcd, usb_transfer_t *transfer, usb_device_request_t *setup);
+    int (*bulk_transfer)(usb_hcd_t *hcd, usb_transfer_t *transfer);
+    int (*interrupt_transfer)(usb_hcd_t *hcd, usb_transfer_t *transfer);
+} usb_hcd_ops_t;
+
+// USB主机控制器驱动
+struct usb_hcd {
+    const char    *name;
+    usb_hcd_ops_t *ops;
+
+    void *regs; // 寄存器基址
+    void *private_data;
+
+    usb_device_t *devices;
+    uint8_t       num_ports;
+
+    struct usb_hcd *next;
+};
+
+typedef struct usb_driver {
+    uint8_t class;
+    uint8_t subclass;
+    int (*probe)(usb_device_t *usbdev);
+    int (*remove)(usb_device_t *usbdev);
+} usb_driver_t;
 
 void regist_netdev(void *desc, uint8_t *mac, uint32_t mtu, netdev_send_t send, netdev_recv_t recv);
 errno_t netdev_send(netdev_t *dev, void *data, uint32_t len);
@@ -76,3 +290,14 @@ size_t device_write(size_t lba, size_t number, const void *buffer, int drive);
 
 pci_device_t *pci_find_vid_did(uint16_t vendor_id, uint16_t device_id);
 pci_device_t *pci_find_class(uint32_t class_code);
+
+void    keyboard_tmp_writer(const uint8_t *data);
+uint8_t keyboard_scancode(uint8_t scancode, uint8_t scancode_1, uint8_t scancode_2);
+
+void register_usb_driver(usb_driver_t *driver);
+int  usb_control_transfer(usb_device_t *device, usb_device_request_t *setup, void *data,
+                          uint32_t length, usb_transfer_callback_t callback, void *user_data);
+int  usb_interrupt_transfer(usb_device_t *device, uint8_t endpoint, void *data, uint32_t length,
+                            usb_transfer_callback_t callback, void *user_data);
+usb_hcd_t *usb_register_hcd(const char *name, usb_hcd_ops_t *ops, void *regs, void *data);
+void       usb_unregister_hcd(usb_hcd_t *hcd);

module/all_include/cp_kernel.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#define MAX_NICE   19
+#define MIN_NICE   -20
+#define NICE_WIDTH (MAX_NICE - MIN_NICE + 1)
+
+#define MAX_RT_PRIO 100
+#define MAX_DL_PRIO 0
+
+#define MAX_PRIO     (MAX_RT_PRIO + NICE_WIDTH)
+#define DEFAULT_PRIO (MAX_RT_PRIO + NICE_WIDTH / 2)
+
+#define NICE_TO_PRIO(nice) ((nice) + DEFAULT_PRIO)
+#define PRIO_TO_NICE(prio) ((prio) - DEFAULT_PRIO)
+
+#define IDLE_PRIORITY NICE_TO_PRIO(20)
+#define NORMAL_PRIORITY NICE_TO_PRIO(0)
+#define KTHREAD_PRIORITY NICE_TO_PRIO(-5)
+
+#include "cp_kernel.h"
+
+pid_t    task_create(const char *name, void (*entry)(uint64_t), uint64_t arg, uint64_t priority);
+uint64_t task_exit(int64_t code);
+void     scheduler_yield();

module/all_include/driver_subsystem.h

@@ -15,7 +15,10 @@ extern char *vfs_get_fullpath(vfs_node_t);
 int ext_mount(const char *src, vfs_node_t node) {
     spin_lock(rwlock);
 
-    if (is_virtual_fs(src)) return -1;
+    if (is_virtual_fs(src)) {
+        spin_unlock(rwlock);
+        return -1;
+    }
 
     ext4_device_register(vfs_dev_get(), src);