sys/linux: import HID report descriptor descriptions (#1311)

Remove long items and better specify tags.

11 files changed, 265 insertions, 165 deletions

diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
index 2f08f643f..5ea6b0afc 100644
--- a/sys/linux/gen/386.go
+++ b/sys/linux/gen/386.go
@@ -6767,36 +6767,61 @@ var structDescs_386 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "fs_opt[\"nls\", stringnoz[codepages_names]]"}, FldName: "nls"},
 	}}},
 	{Key: StructKey{Name: "hid_descriptor_report"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_descriptor_report", IsVarlen: true}, Fields: []Type{
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item"}}},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item_short"}}},
 	}}},
-	{Key: StructKey{Name: "hid_report_item"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item", IsVarlen: true}, Fields: []Type{
-		&UnionType{Key: StructKey{Name: "hid_report_item_short"}, FldName: "short"},
-		&StructType{Key: StructKey{Name: "hid_report_item_long"}, FldName: "long"},
+	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "main"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "global"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "local"},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_long"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_long", IsVarlen: true}, Fields: []Type{
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Val: 15},
-		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bDataSize", TypeSize: 1}}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bLongItemTag", TypeSize: 1}}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 255},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "hid_report_item_short_012"}, FldName: "item_012"},
-		&StructType{Key: StructKey{Name: "hid_report_item_short_4"}, FldName: "item_4"},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_012"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012", IsVarlen: true}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_4"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4", TypeSize: 5}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", TypeSize: 5}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_4"},
+	}}},
 	{Key: StructKey{Name: "hiddev_collection_info", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hiddev_collection_info", TypeSize: 16, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "index", TypeSize: 4, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "type", TypeSize: 4, ArgDir: 2}}},
@@ -25548,7 +25573,7 @@ var structDescs_386 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25559,7 +25584,7 @@ var structDescs_386 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 2},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25570,7 +25595,7 @@ var structDescs_386 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -45819,11 +45844,9 @@ var consts_386 = []ConstValue{
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT", Value: 6},
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT", Value: 5},
 	{Name: "HID_GLOBAL_ITEM_TAG_USAGE_PAGE"},
-	{Name: "HID_ITEM_TAG_LONG", Value: 15},
 	{Name: "HID_ITEM_TYPE_GLOBAL", Value: 1},
 	{Name: "HID_ITEM_TYPE_LOCAL", Value: 2},
 	{Name: "HID_ITEM_TYPE_MAIN"},
-	{Name: "HID_ITEM_TYPE_RESERVED", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DELIMITER", Value: 10},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM", Value: 5},
@@ -52053,4 +52076,4 @@ var consts_386 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_386 = "9a22d9720342e019c2fdb64ade53696c07f6e4ea"
+const revision_386 = "0b0d84e9322a324e5d1713852f21cc9d00e5505a"
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
index 0817612d1..7ec41fd63 100644
--- a/sys/linux/gen/amd64.go
+++ b/sys/linux/gen/amd64.go
@@ -6869,36 +6869,61 @@ var structDescs_amd64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "fs_opt[\"nls\", stringnoz[codepages_names]]"}, FldName: "nls"},
 	}}},
 	{Key: StructKey{Name: "hid_descriptor_report"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_descriptor_report", IsVarlen: true}, Fields: []Type{
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item"}}},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item_short"}}},
 	}}},
-	{Key: StructKey{Name: "hid_report_item"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item", IsVarlen: true}, Fields: []Type{
-		&UnionType{Key: StructKey{Name: "hid_report_item_short"}, FldName: "short"},
-		&StructType{Key: StructKey{Name: "hid_report_item_long"}, FldName: "long"},
+	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "main"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "global"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "local"},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_long"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_long", IsVarlen: true}, Fields: []Type{
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Val: 15},
-		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bDataSize", TypeSize: 1}}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bLongItemTag", TypeSize: 1}}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 255},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "hid_report_item_short_012"}, FldName: "item_012"},
-		&StructType{Key: StructKey{Name: "hid_report_item_short_4"}, FldName: "item_4"},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_012"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012", IsVarlen: true}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_4"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4", TypeSize: 5}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", TypeSize: 5}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_4"},
+	}}},
 	{Key: StructKey{Name: "hiddev_collection_info", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hiddev_collection_info", TypeSize: 16, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "index", TypeSize: 4, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "type", TypeSize: 4, ArgDir: 2}}},
@@ -25919,7 +25944,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25930,7 +25955,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 2},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25941,7 +25966,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -46341,11 +46366,9 @@ var consts_amd64 = []ConstValue{
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT", Value: 6},
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT", Value: 5},
 	{Name: "HID_GLOBAL_ITEM_TAG_USAGE_PAGE"},
-	{Name: "HID_ITEM_TAG_LONG", Value: 15},
 	{Name: "HID_ITEM_TYPE_GLOBAL", Value: 1},
 	{Name: "HID_ITEM_TYPE_LOCAL", Value: 2},
 	{Name: "HID_ITEM_TYPE_MAIN"},
-	{Name: "HID_ITEM_TYPE_RESERVED", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DELIMITER", Value: 10},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM", Value: 5},
@@ -52590,4 +52613,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_amd64 = "db04238eb581f8d6265038791aee4c1d97cc00d2"
+const revision_amd64 = "292a4184c5acef4ffb5b6e767057652187899a00"
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
index edb7815be..b26aaa011 100644
--- a/sys/linux/gen/arm.go
+++ b/sys/linux/gen/arm.go
@@ -6767,36 +6767,61 @@ var structDescs_arm = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "fs_opt[\"nls\", stringnoz[codepages_names]]"}, FldName: "nls"},
 	}}},
 	{Key: StructKey{Name: "hid_descriptor_report"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_descriptor_report", IsVarlen: true}, Fields: []Type{
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item"}}},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item_short"}}},
 	}}},
-	{Key: StructKey{Name: "hid_report_item"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item", IsVarlen: true}, Fields: []Type{
-		&UnionType{Key: StructKey{Name: "hid_report_item_short"}, FldName: "short"},
-		&StructType{Key: StructKey{Name: "hid_report_item_long"}, FldName: "long"},
+	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "main"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "global"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "local"},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_long"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_long", IsVarlen: true}, Fields: []Type{
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Val: 15},
-		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bDataSize", TypeSize: 1}}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bLongItemTag", TypeSize: 1}}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 255},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "hid_report_item_short_012"}, FldName: "item_012"},
-		&StructType{Key: StructKey{Name: "hid_report_item_short_4"}, FldName: "item_4"},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_012"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012", IsVarlen: true}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_4"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4", TypeSize: 5}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", TypeSize: 5}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_4"},
+	}}},
 	{Key: StructKey{Name: "hiddev_collection_info", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hiddev_collection_info", TypeSize: 16, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "index", TypeSize: 4, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "type", TypeSize: 4, ArgDir: 2}}},
@@ -25370,7 +25395,7 @@ var structDescs_arm = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25381,7 +25406,7 @@ var structDescs_arm = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 2},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25392,7 +25417,7 @@ var structDescs_arm = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -45459,11 +45484,9 @@ var consts_arm = []ConstValue{
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT", Value: 6},
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT", Value: 5},
 	{Name: "HID_GLOBAL_ITEM_TAG_USAGE_PAGE"},
-	{Name: "HID_ITEM_TAG_LONG", Value: 15},
 	{Name: "HID_ITEM_TYPE_GLOBAL", Value: 1},
 	{Name: "HID_ITEM_TYPE_LOCAL", Value: 2},
 	{Name: "HID_ITEM_TYPE_MAIN"},
-	{Name: "HID_ITEM_TYPE_RESERVED", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DELIMITER", Value: 10},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM", Value: 5},
@@ -51630,4 +51653,4 @@ var consts_arm = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm = "b7c3bf77e89115f5c0d52c6f52a6d2962d92f0fd"
+const revision_arm = "aa364331e7ce0b6e1d44e153e157093ec9ac8f00"
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
index 2c0f2b72e..ac1735326 100644
--- a/sys/linux/gen/arm64.go
+++ b/sys/linux/gen/arm64.go
@@ -6869,36 +6869,61 @@ var structDescs_arm64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "fs_opt[\"nls\", stringnoz[codepages_names]]"}, FldName: "nls"},
 	}}},
 	{Key: StructKey{Name: "hid_descriptor_report"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_descriptor_report", IsVarlen: true}, Fields: []Type{
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item"}}},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item_short"}}},
 	}}},
-	{Key: StructKey{Name: "hid_report_item"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item", IsVarlen: true}, Fields: []Type{
-		&UnionType{Key: StructKey{Name: "hid_report_item_short"}, FldName: "short"},
-		&StructType{Key: StructKey{Name: "hid_report_item_long"}, FldName: "long"},
+	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "main"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "global"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "local"},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_long"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_long", IsVarlen: true}, Fields: []Type{
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Val: 15},
-		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bDataSize", TypeSize: 1}}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bLongItemTag", TypeSize: 1}}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 255},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "hid_report_item_short_012"}, FldName: "item_012"},
-		&StructType{Key: StructKey{Name: "hid_report_item_short_4"}, FldName: "item_4"},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_012"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012", IsVarlen: true}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_4"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4", TypeSize: 5}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", TypeSize: 5}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_4"},
+	}}},
 	{Key: StructKey{Name: "hiddev_collection_info", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hiddev_collection_info", TypeSize: 16, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "index", TypeSize: 4, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "type", TypeSize: 4, ArgDir: 2}}},
@@ -25736,7 +25761,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25747,7 +25772,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 2},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25758,7 +25783,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -45787,11 +45812,9 @@ var consts_arm64 = []ConstValue{
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT", Value: 6},
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT", Value: 5},
 	{Name: "HID_GLOBAL_ITEM_TAG_USAGE_PAGE"},
-	{Name: "HID_ITEM_TAG_LONG", Value: 15},
 	{Name: "HID_ITEM_TYPE_GLOBAL", Value: 1},
 	{Name: "HID_ITEM_TYPE_LOCAL", Value: 2},
 	{Name: "HID_ITEM_TYPE_MAIN"},
-	{Name: "HID_ITEM_TYPE_RESERVED", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DELIMITER", Value: 10},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM", Value: 5},
@@ -51942,4 +51965,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm64 = "e6ee5b0efc5f18915f49667ee405b00e380d6bc6"
+const revision_arm64 = "8b31bd17e4d7e7fdf86173d43f420f10000c6864"
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
index 3f6873367..0fb66418b 100644
--- a/sys/linux/gen/ppc64le.go
+++ b/sys/linux/gen/ppc64le.go
@@ -6868,36 +6868,61 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "fs_opt[\"nls\", stringnoz[codepages_names]]"}, FldName: "nls"},
 	}}},
 	{Key: StructKey{Name: "hid_descriptor_report"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_descriptor_report", IsVarlen: true}, Fields: []Type{
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item"}}},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "items", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "hid_report_item_short"}}},
 	}}},
-	{Key: StructKey{Name: "hid_report_item"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item", IsVarlen: true}, Fields: []Type{
-		&UnionType{Key: StructKey{Name: "hid_report_item_short"}, FldName: "short"},
-		&StructType{Key: StructKey{Name: "hid_report_item_long"}, FldName: "long"},
+	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "main"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "global"},
+		&UnionType{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "local"},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_long"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_long", IsVarlen: true}, Fields: []Type{
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Val: 15},
-		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bDataSize", TypeSize: 1}}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bLongItemTag", TypeSize: 1}}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 255},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short", IsVarlen: true}, Fields: []Type{
-		&StructType{Key: StructKey{Name: "hid_report_item_short_012"}, FldName: "item_012"},
-		&StructType{Key: StructKey{Name: "hid_report_item_short_4"}, FldName: "item_4"},
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_012"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012", IsVarlen: true}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Path: []string{"data"}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 2},
 	}}},
-	{Key: StructKey{Name: "hid_report_item_short_4"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4", TypeSize: 5}, Fields: []Type{
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", TypeSize: 5}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_types", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Vals: []uint64{0, 1, 2, 3}},
-		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{15, 8, 9, 11, 10, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 1},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_global_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}, Val: 2},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_local_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 8, 9, 10}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", TypeSize: 5}, Fields: []Type{
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bSize", TypeSize: 1}, BitfieldLen: 2, BitfieldMdl: true}, Val: 3},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bType", TypeSize: 1}, BitfieldOff: 2, BitfieldLen: 2, BitfieldMdl: true}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "hid_report_item_main_tags", FldName: "bTag", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}, Vals: []uint64{8, 9, 11, 10, 12}},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]"}, FldName: "item_4"},
+	}}},
+	{Key: StructKey{Name: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]", IsVarlen: true}, Fields: []Type{
+		&StructType{Key: StructKey{Name: "hid_report_item_short_012_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_012"},
+		&StructType{Key: StructKey{Name: "hid_report_item_short_4_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]"}, FldName: "item_4"},
+	}}},
 	{Key: StructKey{Name: "hiddev_collection_info", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "hiddev_collection_info", TypeSize: 16, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "index", TypeSize: 4, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "type", TypeSize: 4, ArgDir: 2}}},
@@ -25606,7 +25631,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25617,7 +25642,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 2},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -25628,7 +25653,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}},
-		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "wMaxPacketSize", TypeSize: 2}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_max_packet_sizes", FldName: "wMaxPacketSize", TypeSize: 2}}, Vals: []uint64{8, 16, 32, 64}, BitMask: true},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bInterval", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bRefresh", TypeSize: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bSynchAddress", TypeSize: 1}}},
@@ -45781,11 +45806,9 @@ var consts_ppc64le = []ConstValue{
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT", Value: 6},
 	{Name: "HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT", Value: 5},
 	{Name: "HID_GLOBAL_ITEM_TAG_USAGE_PAGE"},
-	{Name: "HID_ITEM_TAG_LONG", Value: 15},
 	{Name: "HID_ITEM_TYPE_GLOBAL", Value: 1},
 	{Name: "HID_ITEM_TYPE_LOCAL", Value: 2},
 	{Name: "HID_ITEM_TYPE_MAIN"},
-	{Name: "HID_ITEM_TYPE_RESERVED", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DELIMITER", Value: 10},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX", Value: 3},
 	{Name: "HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM", Value: 5},
@@ -51907,4 +51930,4 @@ var consts_ppc64le = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_ppc64le = "857265a7b29d3b2781b0463de641150b6b368289"
+const revision_ppc64le = "922a4e3ae970503d59073976dffb8f9edb1e7bb7"
diff --git a/sys/linux/vusb.txt b/sys/linux/vusb.txt
index dc5fee402..ccfbe8dab 100644
--- a/sys/linux/vusb.txt
+++ b/sys/linux/vusb.txt
@@ -105,7 +105,7 @@ type usb_endpoint_descriptor_t[ADDR, ATTRS, EXTRA] {
 
 	bEndpointAddress	ADDR
 	bmAttributes		ATTRS
-	wMaxPacketSize		int16
+	wMaxPacketSize		flags[usb_max_packet_sizes, int16]
 	bInterval		int8
 
 	bRefresh		int8
@@ -656,46 +656,41 @@ usb_cdc_mbim_extended_desc {
 # USB descriptors requested after the SET_CONFIGURATION request.
 
 # TODO: define recusively to generate proper structures.
+# Linux HID stack doesn't support long items.
 hid_descriptor_report {
-	items	array[hid_report_item]
+	items	array[hid_report_item_short]
 } [packed]
 
-hid_report_item_short_012 {
+type hid_report_item_short_012_t[TYPE, TAGS] {
 	bSize	len[data, int8:2]
-	bType	flags[hid_report_item_types, int8:2]
-	bTag	flags[hid_report_item_tags, int8:4]
+	bType	const[TYPE, int8:2]
+	bTag	flags[TAGS, int8:4]
 	data	array[int8, 0:2]
 } [packed]
 
-hid_report_item_short_4 {
+type hid_report_item_short_4_t[TYPE, TAGS] {
 	bSize	const[3, int8:2]
-	bType	flags[hid_report_item_types, int8:2]
-	bTag	flags[hid_report_item_tags, int8:4]
+	bType	const[TYPE, int8:2]
+	bTag	flags[TAGS, int8:4]
 	data	array[int8, 4]
 } [packed]
 
-hid_report_item_short [
-	item_012	hid_report_item_short_012
-	item_4		hid_report_item_short_4
+type hid_report_item_short_t[TYPE, TAGS] [
+	item_012	hid_report_item_short_012_t[TYPE, TAGS]
+	item_4		hid_report_item_short_4_t[TYPE, TAGS]
 ] [varlen]
 
-hid_report_item_long {
-	bSize		int8:2
-	bType		int8:2
-	bTag		const[HID_ITEM_TAG_LONG, int8:4]
-	bDataSize	len[data, int8]
-	bLongItemTag	flags[hid_report_item_tags, int8]
-	data		array[int8, 0:255]
-} [packed]
-
-hid_report_item [
-	short	hid_report_item_short
-	long	hid_report_item_long
+hid_report_item_short [
+	main	hid_report_item_short_t[HID_ITEM_TYPE_MAIN, hid_report_item_main_tags]
+	global	hid_report_item_short_t[HID_ITEM_TYPE_GLOBAL, hid_report_item_global_tags]
+	local	hid_report_item_short_t[HID_ITEM_TYPE_LOCAL, hid_report_item_local_tags]
 ] [varlen]
 
-hid_report_item_types = HID_ITEM_TYPE_MAIN, HID_ITEM_TYPE_GLOBAL, HID_ITEM_TYPE_LOCAL, HID_ITEM_TYPE_RESERVED
+hid_report_item_main_tags = HID_MAIN_ITEM_TAG_INPUT, HID_MAIN_ITEM_TAG_OUTPUT, HID_MAIN_ITEM_TAG_FEATURE, HID_MAIN_ITEM_TAG_BEGIN_COLLECTION, HID_MAIN_ITEM_TAG_END_COLLECTION
+hid_report_item_global_tags = HID_GLOBAL_ITEM_TAG_USAGE_PAGE, HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM, HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM, HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM, HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM, HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT, HID_GLOBAL_ITEM_TAG_UNIT, HID_GLOBAL_ITEM_TAG_REPORT_SIZE, HID_GLOBAL_ITEM_TAG_REPORT_ID, HID_GLOBAL_ITEM_TAG_REPORT_COUNT, HID_GLOBAL_ITEM_TAG_PUSH, HID_GLOBAL_ITEM_TAG_POP
+hid_report_item_local_tags = HID_LOCAL_ITEM_TAG_USAGE, HID_LOCAL_ITEM_TAG_USAGE_MINIMUM, HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM, HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX, HID_LOCAL_ITEM_TAG_DESIGNATOR_MINIMUM, HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM, HID_LOCAL_ITEM_TAG_STRING_INDEX, HID_LOCAL_ITEM_TAG_STRING_MINIMUM, HID_LOCAL_ITEM_TAG_STRING_MAXIMUM, HID_LOCAL_ITEM_TAG_DELIMITER
 
-hid_report_item_tags = HID_ITEM_TAG_LONG, HID_MAIN_ITEM_TAG_INPUT, HID_MAIN_ITEM_TAG_OUTPUT, HID_MAIN_ITEM_TAG_FEATURE, HID_MAIN_ITEM_TAG_BEGIN_COLLECTION, HID_MAIN_ITEM_TAG_END_COLLECTION, HID_GLOBAL_ITEM_TAG_USAGE_PAGE, HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM, HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM, HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM, HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM, HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT, HID_GLOBAL_ITEM_TAG_UNIT, HID_GLOBAL_ITEM_TAG_REPORT_SIZE, HID_GLOBAL_ITEM_TAG_REPORT_ID, HID_GLOBAL_ITEM_TAG_REPORT_COUNT, HID_GLOBAL_ITEM_TAG_PUSH, HID_GLOBAL_ITEM_TAG_POP, HID_LOCAL_ITEM_TAG_USAGE, HID_LOCAL_ITEM_TAG_USAGE_MINIMUM, HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM, HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX, HID_LOCAL_ITEM_TAG_DESIGNATOR_MINIMUM, HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM, HID_LOCAL_ITEM_TAG_STRING_INDEX, HID_LOCAL_ITEM_TAG_STRING_MINIMUM, HID_LOCAL_ITEM_TAG_STRING_MAXIMUM, HID_LOCAL_ITEM_TAG_DELIMITER
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 usb_hub_descriptor_hs {
 	bDescLength		len[parent, int8]
diff --git a/sys/linux/vusb_386.const b/sys/linux/vusb_386.const
index 21ff42280..2e5e6a44c 100644
--- a/sys/linux/vusb_386.const
+++ b/sys/linux/vusb_386.const
@@ -26,11 +26,9 @@ HID_GLOBAL_ITEM_TAG_REPORT_SIZE = 7
 HID_GLOBAL_ITEM_TAG_UNIT = 6
 HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT = 5
 HID_GLOBAL_ITEM_TAG_USAGE_PAGE = 0
-HID_ITEM_TAG_LONG = 15
 HID_ITEM_TYPE_GLOBAL = 1
 HID_ITEM_TYPE_LOCAL = 2
 HID_ITEM_TYPE_MAIN = 0
-HID_ITEM_TYPE_RESERVED = 3
 HID_LOCAL_ITEM_TAG_DELIMITER = 10
 HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX = 3
 HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM = 5
diff --git a/sys/linux/vusb_amd64.const b/sys/linux/vusb_amd64.const
index 21ff42280..2e5e6a44c 100644
--- a/sys/linux/vusb_amd64.const
+++ b/sys/linux/vusb_amd64.const
@@ -26,11 +26,9 @@ HID_GLOBAL_ITEM_TAG_REPORT_SIZE = 7
 HID_GLOBAL_ITEM_TAG_UNIT = 6
 HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT = 5
 HID_GLOBAL_ITEM_TAG_USAGE_PAGE = 0
-HID_ITEM_TAG_LONG = 15
 HID_ITEM_TYPE_GLOBAL = 1
 HID_ITEM_TYPE_LOCAL = 2
 HID_ITEM_TYPE_MAIN = 0
-HID_ITEM_TYPE_RESERVED = 3
 HID_LOCAL_ITEM_TAG_DELIMITER = 10
 HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX = 3
 HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM = 5
diff --git a/sys/linux/vusb_arm.const b/sys/linux/vusb_arm.const
index 21ff42280..2e5e6a44c 100644
--- a/sys/linux/vusb_arm.const
+++ b/sys/linux/vusb_arm.const
@@ -26,11 +26,9 @@ HID_GLOBAL_ITEM_TAG_REPORT_SIZE = 7
 HID_GLOBAL_ITEM_TAG_UNIT = 6
 HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT = 5
 HID_GLOBAL_ITEM_TAG_USAGE_PAGE = 0
-HID_ITEM_TAG_LONG = 15
 HID_ITEM_TYPE_GLOBAL = 1
 HID_ITEM_TYPE_LOCAL = 2
 HID_ITEM_TYPE_MAIN = 0
-HID_ITEM_TYPE_RESERVED = 3
 HID_LOCAL_ITEM_TAG_DELIMITER = 10
 HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX = 3
 HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM = 5
diff --git a/sys/linux/vusb_arm64.const b/sys/linux/vusb_arm64.const
index 21ff42280..2e5e6a44c 100644
--- a/sys/linux/vusb_arm64.const
+++ b/sys/linux/vusb_arm64.const
@@ -26,11 +26,9 @@ HID_GLOBAL_ITEM_TAG_REPORT_SIZE = 7
 HID_GLOBAL_ITEM_TAG_UNIT = 6
 HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT = 5
 HID_GLOBAL_ITEM_TAG_USAGE_PAGE = 0
-HID_ITEM_TAG_LONG = 15
 HID_ITEM_TYPE_GLOBAL = 1
 HID_ITEM_TYPE_LOCAL = 2
 HID_ITEM_TYPE_MAIN = 0
-HID_ITEM_TYPE_RESERVED = 3
 HID_LOCAL_ITEM_TAG_DELIMITER = 10
 HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX = 3
 HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM = 5
diff --git a/sys/linux/vusb_ppc64le.const b/sys/linux/vusb_ppc64le.const
index 21ff42280..2e5e6a44c 100644
--- a/sys/linux/vusb_ppc64le.const
+++ b/sys/linux/vusb_ppc64le.const
@@ -26,11 +26,9 @@ HID_GLOBAL_ITEM_TAG_REPORT_SIZE = 7
 HID_GLOBAL_ITEM_TAG_UNIT = 6
 HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT = 5
 HID_GLOBAL_ITEM_TAG_USAGE_PAGE = 0
-HID_ITEM_TAG_LONG = 15
 HID_ITEM_TYPE_GLOBAL = 1
 HID_ITEM_TYPE_LOCAL = 2
 HID_ITEM_TYPE_MAIN = 0
-HID_ITEM_TYPE_RESERVED = 3
 HID_LOCAL_ITEM_TAG_DELIMITER = 10
 HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX = 3
 HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM = 5