Creating our dummy Keypadder input device now works.

SMerrony · SMerrony · commit 5c29618ac26e · 2023-02-04T17:06:35.000+01:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,9 +9,10 @@
             "type": "gdb",
             "request": "launch",
             "target": "./bin/keypadder",
-            "arguments": "--config=examples/keypad.toml",
+            "arguments": "--config=${workspaceRoot}/examples/keypad.toml",
             "cwd": "${workspaceRoot}",
-            "valuesFormatting": "parseText"
+            "valuesFormatting": "parseText",
+            "gdbpath": "/home/steve/bin/sudo_gdb.sh"
         }
     ]
 }
diff --git a/src/injector.adb b/src/injector.adb
@@ -2,34 +2,99 @@
 --  SPDX-FileCopyrightText:  Copyright 2023 Stephen Merrony
 
 with Ada.Text_IO;
+with Interfaces;  use Interfaces;
 
-with Uinput;  use Uinput;
+with Uinput;      use Uinput;
 
 package body Injector is
 
    task body Injector_Task is
       Uinput_FID  : K_File_ID_T;
+      Usetup      : K_Uinput_Setup_T;
       IE_Time     : K_Timeval_T;  --  defaults to zeroes
       Key_IE      : K_Input_Event_T;
       Report_IE   : constant K_Input_Event_T := (Time     => IE_Time,
                                                  IE_Type  => EV_SYN,
                                                  IE_Code  => SYN_REPORT,
                                                  IE_Value => 0);
       Result      : K_Int_T;
+      Key_Val     : K_Int_T := 0;
+      Request     : K_Ioctl_ID_T;
+
+      function IOW (Code : Unsigned_32; Len : Integer) return K_Ioctl_ID_T is
+         Tmp : Unsigned_32 := Code;
+      begin
+         Tmp := Tmp + Shift_Left (Unsigned_32 (UINPUT_IOCTL_BASE), 8);
+         Tmp := Tmp + Shift_Left (Unsigned_32 (Len), 16);  --  arg length of 4 (?)
+         Tmp := Tmp + Shift_Left (Unsigned_32 (1), 30);  --  direction (write, out)
+         return K_Ioctl_ID_T (Tmp);
+      end IOW;
+      function IO (Code : Unsigned_32; Len : Integer) return K_Ioctl_ID_T is
+         Tmp : Unsigned_32 := Code;
+      begin
+         Tmp := Tmp + Shift_Left (Unsigned_32 (UINPUT_IOCTL_BASE), 8);
+         Tmp := Tmp + Shift_Left (Unsigned_32 (Len), 16);  --  arg length of 4 (?)
+         return K_Ioctl_ID_T (Tmp);
+      end IO;
    begin
       accept Start do
-         K_Open (Uinput_FID, Linux_Path, O_WRONLY + O_NONBLOCK);
+         Uinput_FID := K_Open (Linux_Path, O_WRONLY + O_NONBLOCK);
+         if Uinput_FID = -1 then
+            Ada.Text_IO.Put_Line ("ERROR: Could not open " & Linux_Path);
+            raise Cannot_Open;
+         end if;
          --  populate the unchanging fields in the Key_IE
          Key_IE.Time := IE_Time;
          Key_IE.IE_Type := EV_KEY;
+
+         --  set up for keyboard events
+         Request := IOW (UI_SET_EVBIT, 4);
+         Result := K_IOCTL_3_Arg (Uinput_FID, Request, K_Long_T (EV_KEY));
+         if Result = -1 then
+            C_Perror ("UI_SET_EVBIT failed...");
+            raise IOCTL_Error with "UI_SET_EVBIT failed";
+         end if;
+
+         --  enable all possible (0 .. 255) key values
+         loop
+            Result := K_IOCTL_3_Arg (Uinput_FID, IOW (UI_SET_KEYBIT, 4), K_Long_T (Key_Val));
+            if Result = -1 then
+               Ada.Text_IO.Put_Line ("ERROR: Could not SET_KEYBIT");
+               raise IOCTL_Error with "Could not SET_KEYBIT";
+            end if;
+            Key_Val := Key_Val + 1;
+            exit when Key_Val = 256;
+         end loop;
+
+         --  configure our dummy USB device...
+         Usetup.ID.K_Bustype := BUS_USB;
+         Usetup.ID.K_Vendor  := 16#1234#; --  sample vendor
+         Usetup.ID.K_Product := 16#5678#; --  sample K_Product
+         Usetup.Name (1 .. 9) := "Keypadder";
+         Usetup.Name (10 .. Uinput_Max_Name_Size) := (others => Character'Val (0));
+         Request := IOW (UI_DEV_SETUP, Usetup'Size / 8);
+         Result := K_IOCTL_Uinput_Setup (Uinput_FID, Request, Usetup);
+         if Result = -1 then
+            C_Perror ("UI_DEV_SETUP failed...");
+            raise IOCTL_Error with "UI_DEV_SETUP failed";
+         end if;
+
+         --  create the dummy device
+         Request := IO (UI_DEV_CREATE, 0);
+         Result := K_IOCTL_2_Arg (Uinput_FID, Request);
+         if Result = -1 then
+            C_Perror ("UI_DEV_CREATE failed...");
+            raise IOCTL_Error with "UI_DEV_CREATE failed";
+         end if;
       end Start;
+
       loop
          select
             accept Send (Keys : String) do
                Ada.Text_IO.Put_Line ("Injector got Send request for: " & Keys);
                for C in Keys'Range loop
                   --  Key press, report the event, send key release, and report again
-                  Key_IE.IE_Code := Char_To_K_Int (Keys (C));
+                  Key_IE.IE_Code := Char_To_K_U16 (Keys (C));
                   Key_IE.IE_Value := 1;
                   --  IE_IO.Write (Uinput_File, Key_IE);
                   --  IE_IO.Write (Uinput_File, Report_IE);
diff --git a/src/uinput.adb b/src/uinput.adb
@@ -3,7 +3,9 @@
 
 package body Uinput is
 
-   procedure Emit (FID : K_File_ID_T; E_Type, E_Code, E_Val : K_Int_T) is
+   procedure Emit (FID : K_File_ID_T;
+                   E_Type, E_Code : K_U16_T;
+                   E_Val : K_Int_T) is
       IE         : K_Input_Event_T;
       Dummy_SS   : K_SSize_T;
       IE_Address : constant System.Address := IE'Address;
diff --git a/src/uinput.ads b/src/uinput.ads
@@ -3,6 +3,7 @@
 
 with Ada.Unchecked_Conversion;
 with Interfaces; use Interfaces;
+with System;
 with System.Address_To_Access_Conversions;
 
 package Uinput is
@@ -18,82 +19,90 @@ package Uinput is
    type K_Size_T     is new Unsigned_64;
    type K_SSize_T    is new Integer_64;
    type K_File_ID_T  is new Integer_32;
-   type K_Ioctl_ID_T is new Integer_32;
+   type K_Ioctl_ID_T is new Unsigned_32;
    type K_Dummy_T    is new Integer_32;
 
+   UINPUT_IOCTL_BASE : constant Integer_32 := 85; --  ASCII 'U'
+
    Uinput_Max_Name_Size : constant Integer := 80;
+   BUS_USB : constant K_U16_T := 3;
 
    type K_Input_ID_T is record
       K_Bustype,
       K_Vendor,
       K_Product,
       K_Version : K_U16_T;
    end record;
+   pragma Convention (C, K_Input_ID_T);
 
    type K_Uinput_Setup_T is record
       ID             : K_Input_ID_T;
       Name           : String (1 .. Uinput_Max_Name_Size);
-      FF_Effects_Max : K_U32_T;
+      FF_Effects_Max : K_U32_T := 0;
    end record;
+   pragma Convention (C, K_Uinput_Setup_T);
+
+   UI_SET_EVBIT  : constant Unsigned_32 := 100;
+   UI_SET_KEYBIT : constant Unsigned_32 := 101;
 
-   package Uinput_Setup_Pointers is new System.Address_To_Access_Conversions (K_Uinput_Setup_T);
+   UI_DEV_SETUP   : constant Unsigned_32 := 3;
+   UI_DEV_CREATE  : constant Unsigned_32 := 1;
+   UI_DEV_DESTROY : constant Unsigned_32 := 2;
 
    type K_Timeval_T is record
       TV_Sec  : K_Int_T  := 0;
       TV_USec : K_Long_T := 0;
    end record;
 
    --  The Event Types we need...
-   EV_SYN : constant K_Int_T := 0;
-   EV_KEY : constant K_Int_T := 1;
-   EV_REL : constant K_Int_T := 2;
+   EV_SYN : constant K_U16_T := 0;
+   EV_KEY : constant K_U16_T := 1;
+   EV_REL : constant K_U16_T := 2;
 
    type K_Input_Event_T is record
       Time     : K_Timeval_T;
-      IE_Type  : K_Int_T;
-      IE_Code  : K_Int_T;
+      IE_Type  : K_U16_T;
+      IE_Code  : K_U16_T;
       IE_Value : K_Int_T;
    end record;
+   pragma Convention (C, K_Input_Event_T);
 
    K_Input_Event_Size : constant K_Size_T := K_Input_Event_T'Size;
 
    package IE_Pointers is new System.Address_To_Access_Conversions (K_Input_Event_T);
 
    --  The short-form 2 arg (i.e. 1 parameter) ioctl call
-   procedure K_IOCTL_2_Arg (Result   : out K_Int_T;
-                            FID      : K_File_ID_T;
-                            IOCTL_ID : K_Ioctl_ID_T;
-                            Ignored  : K_Dummy_T);
+   function K_IOCTL_2_Arg (FID      : K_File_ID_T;
+                           IOCTL_ID : K_Ioctl_ID_T;
+                           Ignored  : K_Dummy_T := 0
+                          ) return K_Int_T;
    pragma Import (C, K_IOCTL_2_Arg, "ioctl");
-   pragma Import_Valued_Procedure (K_IOCTL_2_Arg);
 
    --  The long-form 3 arg (i.e. 2 parameters) ioctl call
    --  with a simple (int) 3rd argument
-   procedure K_IOCTL_3_Arg (Result    : out K_Int_T;
-                            FID       : K_File_ID_T;
-                            IOCTL_ID  : K_Ioctl_ID_T;
-                            IOCTL_Arg : K_Int_T);
+   function K_IOCTL_3_Arg (FID       : K_File_ID_T;
+                           IOCTL_ID  : K_Ioctl_ID_T;
+                           IOCTL_Arg : K_Long_T
+                          ) return K_Int_T;
    pragma Import (C, K_IOCTL_3_Arg, "ioctl");
-   pragma Import_Valued_Procedure (K_IOCTL_3_Arg);
 
    --  The long-form 3 arg (i.e. 2 parameters) ioctl call
    --  with an (address of) Uinput_Setup 3rd argument
-   procedure K_IOCTL_Uinput_Setup (Result            : out K_Int_T;
-                                   FID               : K_File_ID_T;
-                                   IOCTL_ID          : K_Ioctl_ID_T;
-                                   Uinput_Setup_Addr : Uinput_Setup_Pointers.Object_Pointer);
+   function K_IOCTL_Uinput_Setup (FID               : K_File_ID_T;
+                                  IOCTL_ID          : K_Ioctl_ID_T;
+                                  Usetup            : K_Uinput_Setup_T
+                                 ) return K_Int_T;
    pragma Import (C, K_IOCTL_Uinput_Setup, "ioctl");
-   pragma Import_Valued_Procedure (K_IOCTL_Uinput_Setup);
+
+   procedure C_Perror (Msg : String);
+   pragma Import (C, C_Perror, "perror");
 
    O_WRONLY   : constant K_Int_T := 1;
    O_NONBLOCK : constant K_Int_T := 2048;
 
-   --  System file open call
-   procedure K_Open (FID  : out K_File_ID_T;
-                     Path : String;
-                     Flags : K_Int_T);
+   function K_Open (Path  : String;
+                    Flags : K_Int_T) return K_File_ID_T;
    pragma Import (C, K_Open, "open");
-   pragma Import_Valued_Procedure (K_Open);
 
    --  System file write call
    procedure K_Write_IE (Written : out K_SSize_T;
@@ -110,12 +119,18 @@ package Uinput is
    pragma Import_Valued_Procedure (K_Close);
 
    --  The special Event Code we need...
-   SYN_REPORT : constant K_Int_T := 0;
+   SYN_REPORT : constant K_U16_T := 0;
 
-   function Char_To_K_Int is new Ada.Unchecked_Conversion (Character, K_Int_T);
+   pragma Warnings (Off, "types for unchecked conversion have different sizes");
+   function Char_To_K_U16 is new Ada.Unchecked_Conversion (Character, K_U16_T);
+   pragma Warnings (On, "types for unchecked conversion have different sizes");
 
-   Cannot_Open, Cannot_Write : exception;
+   Cannot_Open,
+   Cannot_Write,
+   IOCTL_Error   : exception;
 
-   procedure Emit (FID : K_File_ID_T; E_Type, E_Code, E_Val : K_Int_T);
+   procedure Emit (FID            : K_File_ID_T;
+                   E_Type, E_Code : K_U16_T;
+                   E_Val          : K_Int_T);
 
 end Uinput;

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,10 @@`
`9`	`9`	`"type": "gdb",`
`10`	`10`	`"request": "launch",`
`11`	`11`	`"target": "./bin/keypadder",`
`12`		`- "arguments": "--config=examples/keypad.toml",`
	`12`	`+ "arguments": "--config=${workspaceRoot}/examples/keypad.toml",`
`13`	`13`	`"cwd": "${workspaceRoot}",`
`14`		`- "valuesFormatting": "parseText"`
	`14`	`+ "valuesFormatting": "parseText",`
	`15`	`+ "gdbpath": "/home/steve/bin/sudo_gdb.sh"`
`15`	`16`	`}`
`16`	`17`	`]`
`17`	`18`	`}`