sys/openbsd: add missing WSDISPLAYIO_SBURNER ioctl command

google · Jun 30, 2019 · 699d644 · 699d644
1 parent 7509bf3
commit 699d644
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/executor/defs.h b/executor/defs.h
@@ -140,7 +140,7 @@
 
 #if GOARCH_amd64
 #define GOARCH "amd64"
-#define SYZ_REVISION "6255253f9674826c8aeacb80503607f3c81dade2"
+#define SYZ_REVISION "7f4015fe5d4b3777d30d2d5dd379e3de766e0e8e"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096

diff --git a/executor/syscalls.h b/executor/syscalls.h
@@ -15971,6 +15971,7 @@ const call_t syscalls[] = {
     {"ioctl$WSDISPLAYIO_GVIDEO", 54},
     {"ioctl$WSDISPLAYIO_LDFONT", 54},
     {"ioctl$WSDISPLAYIO_LSFONT", 54},
+    {"ioctl$WSDISPLAYIO_SBURNER", 54},
     {"ioctl$WSDISPLAYIO_SETSCREEN", 54},
     {"ioctl$WSDISPLAYIO_SMODE", 54},
     {"ioctl$WSDISPLAYIO_SVIDEO", 54},

diff --git a/sys/openbsd/gen/amd64.go b/sys/openbsd/gen/amd64.go
@@ -652,6 +652,11 @@ var structDescs_amd64 = []*KeyedStruct{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "filename", FldName: "screentype", TypeSize: 16}, Kind: 3},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "filename", FldName: "emul", TypeSize: 16}, Kind: 3},
 	}}},
+	{Key: StructKey{Name: "wsdisplay_burner"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "wsdisplay_burner", TypeSize: 12}, Fields: []Type{
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "off", TypeSize: 4}}},
+		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "on", TypeSize: 4}}},
+		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "wsdisplay_burner_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8}, BitMask: true},
+	}}},
 	{Key: StructKey{Name: "wsdisplay_burner", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "wsdisplay_burner", TypeSize: 12, ArgDir: 1}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "off", TypeSize: 4, ArgDir: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "on", TypeSize: 4, ArgDir: 1}}},
@@ -1573,6 +1578,11 @@ var syscalls_amd64 = []*Syscall{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 3227014990},
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "wsdisplay_font", Dir: 1}}},
 	}},
+	{NR: 54, Name: "ioctl$WSDISPLAYIO_SBURNER", CallName: "ioctl", Args: []Type{
+		&ResourceType{TypeCommon: TypeCommon{TypeName: "fd_wsdisplay", FldName: "fd", TypeSize: 4}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 2148292433},
+		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "wsdisplay_burner"}}},
+	}},
 	{NR: 54, Name: "ioctl$WSDISPLAYIO_SETSCREEN", CallName: "ioctl", Args: []Type{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "fd_wsdisplay", FldName: "fd", TypeSize: 4}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 2147768150},
@@ -2885,6 +2895,7 @@ var consts_amd64 = []ConstValue{
 	{Name: "WSDISPLAYIO_MODE_DUMBFB", Value: 2},
 	{Name: "WSDISPLAYIO_MODE_EMUL"},
 	{Name: "WSDISPLAYIO_MODE_MAPPED", Value: 1},
+	{Name: "WSDISPLAYIO_SBURNER", Value: 2148292433},
 	{Name: "WSDISPLAYIO_SETSCREEN", Value: 2147768150},
 	{Name: "WSDISPLAYIO_SMODE", Value: 2147768140},
 	{Name: "WSDISPLAYIO_SVIDEO", Value: 2147768133},
@@ -2970,4 +2981,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "__MAP_NOREPLACE", Value: 2048},
 }
 
-const revision_amd64 = "6255253f9674826c8aeacb80503607f3c81dade2"
+const revision_amd64 = "7f4015fe5d4b3777d30d2d5dd379e3de766e0e8e"
diff --git a/sys/openbsd/wscons.txt b/sys/openbsd/wscons.txt
@@ -40,6 +40,7 @@ ioctl$WSDISPLAYIO_GMODE(fd fd_wsdisplay, cmd const[WSDISPLAYIO_GMODE], arg ptr[o
 ioctl$WSDISPLAYIO_GVIDEO(fd fd_wsdisplay, cmd const[WSDISPLAYIO_GVIDEO], arg ptr[out, int32])
 ioctl$WSDISPLAYIO_LDFONT(fd fd_wsdisplay, cmd const[WSDISPLAYIO_LDFONT], arg ptr[in, wsdisplay_font])
 ioctl$WSDISPLAYIO_LSFONT(fd fd_wsdisplay, cmd const[WSDISPLAYIO_LSFONT], arg ptr[out, wsdisplay_font])
+ioctl$WSDISPLAYIO_SBURNER(fd fd_wsdisplay, cmd const[WSDISPLAYIO_SBURNER], arg ptr[in, wsdisplay_burner])
 ioctl$WSDISPLAYIO_SETSCREEN(fd fd_wsdisplay, cmd const[WSDISPLAYIO_SETSCREEN], arg ptr[in, int32])
 ioctl$WSDISPLAYIO_SMODE(fd fd_wsdisplay, cmd const[WSDISPLAYIO_SMODE], arg ptr[in, wsdisplay_mode])
 ioctl$WSDISPLAYIO_SVIDEO(fd fd_wsdisplay, cmd const[WSDISPLAYIO_SVIDEO], arg ptr[in, wsdisplay_svideo])

diff --git a/sys/openbsd/wscons_amd64.const b/sys/openbsd/wscons_amd64.const
@@ -44,6 +44,7 @@ WSDISPLAYIO_LSFONT = 3227014990
 WSDISPLAYIO_MODE_DUMBFB = 2
 WSDISPLAYIO_MODE_EMUL = 0
 WSDISPLAYIO_MODE_MAPPED = 1
+WSDISPLAYIO_SBURNER = 2148292433
 WSDISPLAYIO_SETSCREEN = 2147768150
 WSDISPLAYIO_SMODE = 2147768140
 WSDISPLAYIO_SVIDEO = 2147768133