From e2d61622eb61b451cb2cc72684154fafa1977eef Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 4 Nov 2019 12:38:48 +0100 Subject: sys/linux: improve CAN descriptions --- sys/linux/gen/amd64.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'sys/linux/gen/amd64.go') diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index 6f5b304e1..4faac8cad 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -10258,12 +10258,12 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "timeval", Dir: 1}, FldName: "value"}, }}}, {Key: StructKey{Name: "j1939_filter"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "j1939_filter", TypeSize: 32}, Fields: []Type{ - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "name", TypeSize: 8}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "name_mask", TypeSize: 8}}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "name", TypeSize: 8}}, Kind: 1, RangeEnd: 3}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "name_mask", TypeSize: 8}}, Kind: 1, RangeEnd: 3}, &StructType{Key: StructKey{Name: "can_j1939_pgn"}, FldName: "pgn"}, &StructType{Key: StructKey{Name: "can_j1939_pgn"}, FldName: "pgn_mask"}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "addr", TypeSize: 1}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "addr_mask", TypeSize: 1}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "can_j1939_addrs", FldName: "addr", TypeSize: 1}}, Vals: []uint64{253, 254, 255, 0, 1, 2}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "can_j1939_addrs", FldName: "addr_mask", TypeSize: 1}}, Vals: []uint64{253, 254, 255, 0, 1, 2}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 6}}, IsPad: true}, }}}, {Key: StructKey{Name: "jfs_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "jfs_options", IsVarlen: true}, Fields: []Type{ @@ -23858,10 +23858,10 @@ var structDescs_amd64 = []*KeyedStruct{ {Key: StructKey{Name: "sockaddr_can_j1939"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_can_j1939", TypeSize: 24}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "can_family", TypeSize: 2}}, Val: 29}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex_vcan", FldName: "can_ifindex", TypeSize: 4, IsOptional: true}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "name", TypeSize: 8}}}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex_vcan", FldName: "can_ifindex", TypeSize: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "name", TypeSize: 8}}, Kind: 1, RangeEnd: 3}, &StructType{Key: StructKey{Name: "can_j1939_pgn"}, FldName: "pgn"}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "addr", TypeSize: 1}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "can_j1939_addrs", FldName: "addr", TypeSize: 1}}, Vals: []uint64{253, 254, 255, 0, 1, 2}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }}}, {Key: StructKey{Name: "sockaddr_ethernet"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ethernet", TypeSize: 16}, Fields: []Type{ @@ -40190,7 +40190,7 @@ var syscalls_amd64 = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "ifreq_dev_t[\"team0\", ifindex_team[opt]]", Dir: 2}}}, }}, {NR: 16, Name: "ioctl$ifreq_SIOCGIFINDEX_vcan", CallName: "ioctl", Args: []Type{ - &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_can", FldName: "fd", TypeSize: 4}}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 35123}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "ifreq_dev_t[vcan_device_names, ifindex_vcan]", Dir: 2}}}, }}, @@ -50553,6 +50553,9 @@ var consts_amd64 = []ConstValue{ {Name: "ITIMER_PROF", Value: 2}, {Name: "ITIMER_REAL"}, {Name: "ITIMER_VIRTUAL", Value: 1}, + {Name: "J1939_IDLE_ADDR", Value: 254}, + {Name: "J1939_MAX_UNICAST_ADDR", Value: 253}, + {Name: "J1939_NO_ADDR", Value: 255}, {Name: "KCMPROTO_CONNECTED"}, {Name: "KCMP_EPOLL_TFD", Value: 7}, {Name: "KCMP_FILE"}, @@ -56173,4 +56176,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "89d58cbf2acf0a284a5f6f4dc2c1f64cd035bee9" +const revision_amd64 = "2ed58ed122aa5c87b97d7db0caaa4995434d7938" -- cgit mrf-deployment