diff --git a/definitions/keyboard-standard b/definitions/keyboard-standard new file mode 100644 index 0000000..28be602 --- /dev/null +++ b/definitions/keyboard-standard @@ -0,0 +1,4 @@ +protocol="1" +subclass="1" +report_length="8" +report_name="keyboard-standard" diff --git a/definitions/standard-keyboard b/definitions/standard-keyboard deleted file mode 100644 index fa8f7b4..0000000 --- a/definitions/standard-keyboard +++ /dev/null @@ -1,4 +0,0 @@ -protocols="1" -subclasses="1" -report_lengths="1" -report_names="keyboard-standard" \ No newline at end of file diff --git a/module.prop b/module.prop index d2fef83..3bca9c9 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=ghid name=ghid version=0 -versionCode=23 +versionCode=26 author=lordwelch description=creates ghid device files in /dev diff --git a/reports/standard-keyboard b/reports/keyboard-standard similarity index 100% rename from reports/standard-keyboard rename to reports/keyboard-standard diff --git a/system/bin/ghid.sh b/system/bin/ghid.sh index 6661a84..62b8cf1 100644 --- a/system/bin/ghid.sh +++ b/system/bin/ghid.sh @@ -2,7 +2,7 @@ # $1 setup controller=$(getprop sys.usb.controller) moddir=[MODDIR] -selected=standard-keyboard +selected=keyboard-standard remove_ghid() { echo "disabling ghid" >>$moddir/ghid.log rm /config/usb_gadget/g1/configs/b.1/fhid @@ -10,38 +10,43 @@ remove_ghid() { } enable_ghid() { - echo "enabling ghid" >>$moddir/ghid.log - running=true - . "$moddir/definitions/$selected" - if [ ! -d /config/usb_gadget/g1/functions/hid.usb0 ]; then - mkdir /config/usb_gadget/g1/functions/hid.usb0 - fi - current_protocols="$(cat /config/usb_gadget/g1/functions/hid.usb0/protocol)" - current_subclasses="$(cat /config/usb_gadget/g1/functions/hid.usb0/subclass)" - current_report_lengths="$(cat /config/usb_gadget/g1/functions/hid.usb0/report_length)" - echo "current ghid" >>$moddir/ghid.log - echo current_protocols $current_protocols >>$moddir/ghid.log - echo current_subclasses $current_subclasses >>$moddir/ghid.log - echo current_report_lengths $current_report_lengths >>$moddir/ghid.log + for f in $selected; do + echo "enabling ghid" >>$moddir/ghid.log + running=true + . "$moddir/definitions/$f" + if [ ! -d /config/usb_gadget/g1/functions/hid.usb0 ]; then + mkdir /config/usb_gadget/g1/functions/hid.usb0 + fi + current_protocol="$(cat /config/usb_gadget/g1/functions/hid.usb0/protocol)" + current_subclass="$(cat /config/usb_gadget/g1/functions/hid.usb0/subclass)" + current_report_length="$(cat /config/usb_gadget/g1/functions/hid.usb0/report_length)" + echo "current ghid" >>$moddir/ghid.log + echo current_protocol $current_protocol >>$moddir/ghid.log + echo current_subclass $current_subclass >>$moddir/ghid.log + echo current_report_length $current_report_length >>$moddir/ghid.log - if [ -e /config/usb_gadget/g1/functions/hid.usb0 -a "$current_protocols" == "$protocols" -a "$current_subclasses" == "$subclasses" -a "$current_report_lengths" == "$report_lengths" ] && diff "$moddir/reports/$report_names" /config/usb_gadget/g1/functions/hid.usb0/report_desc ; then - echo nothing to update >>$moddir/ghid.log - return 0 - fi + if [ -e /config/usb_gadget/g1/functions/hid.usb0 -a "$current_protocol" == "$protocol" -a "$current_subclass" == "$subclass" -a "$current_report_length" == "$report_length" ] && diff "$moddir/reports/$report_name" /config/usb_gadget/g1/functions/hid.usb0/report_desc ; then + echo nothing to update >>$moddir/ghid.log + return 0 + fi - echo new ghid >>$moddir/ghid.log + echo new ghid >>$moddir/ghid.log - echo $protocols >>$moddir/ghid.log - echo $subclasses >>$moddir/ghid.log - echo $report_lengths >>$moddir/ghid.log + echo $protocol >>$moddir/ghid.log + echo $subclass >>$moddir/ghid.log + echo $report_length >>$moddir/ghid.log + + rm /config/usb_gadget/g1/configs/b.1/fhid + echo $protocol >/config/usb_gadget/g1/functions/hid.usb0/protocol + echo $subclass >/config/usb_gadget/g1/functions/hid.usb0/subclass + echo $report_length >/config/usb_gadget/g1/functions/hid.usb0/report_length + cp "$moddir/reports/$report_name" /config/usb_gadget/g1/functions/hid.usb0/report_desc + cd /config/usb_gadget/g1/configs/b.1/ + /data/adb/magisk/busybox ln -nsf ../../../../usb_gadget/g1/functions/hid.usb0 ./fhid + done + echo none >/config/usb_gadget/g1/UDC + echo "$controller" >/config/usb_gadget/g1/UDC - rm /config/usb_gadget/g1/configs/b.1/fhid - echo $protocols >/config/usb_gadget/g1/functions/hid.usb0/protocol - echo $subclasses >/config/usb_gadget/g1/functions/hid.usb0/subclass - echo $report_lengths >/config/usb_gadget/g1/functions/hid.usb0/report_length - cp "$moddir/reports/$report_names" /config/usb_gadget/g1/functions/hid.usb0/report_desc - cd /config/usb_gadget/g1/configs/b.1/ - /data/adb/magisk/busybox ln -nsf ../../../../usb_gadget/g1/functions/hid.usb0 ./fhid } echo success ghid was run >>$moddir/ghid.log @@ -59,3 +64,8 @@ case "$1" in enable_ghid ;; esac +chcon u:object_r:null_device:s0 /dev/hidg* +chmod 666 /dev/hidg* +sleep 1 +chcon u:object_r:null_device:s0 /dev/hidg* +chmod 666 /dev/hidg*