Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop

2023-02-28 17:20:51 +08:00
parent 5ae31a37f3 779444f998
commit 179c894840
97 changed files with 5890 additions and 172 deletions
@@ -172,6 +172,9 @@ int PrivIoctl(int fd, int cmd, void *args)
    case WDT_TYPE:
    case CAMERA_TYPE:
    case KPU_TYPE:
+    case TIME_TYPE:
+    case FLASH_TYPE:
+    case CAN_TYPE:
        ret = ioctl(fd, cmd, ioctl_cfg->args);
        break;
    default:
@@ -151,7 +151,10 @@ enum IoctlDriverType
    WDT_TYPE,
    RTC_TYPE,
    CAMERA_TYPE,
+    CAN_TYPE,
    KPU_TYPE,
+    FLASH_TYPE,
+    TIME_TYPE,
    DEFAULT_TYPE,
 };

@@ -252,6 +255,25 @@ enum TCP_OPTION {
    RECV_DATA,
 };

+struct CanDriverConfigure 
+{
+    uint8 tsjw;
+    uint8 tbs2 ;
+    uint8 tbs1;
+    uint8 mode;
+    uint16 brp;
+};
+
+struct CanSendConfigure
+{
+    uint32 stdid;
+    uint32 exdid;
+    uint8 ide;
+    uint8 rtr;
+    uint8 data_lenth;
+    uint8 *data;
+};
+
 typedef struct
 {
    uint8_t *buffer;