rename ioctl.h to cros_ec.h

martinpitt · Jun 9, 2024 · 7eaf4b4 · 7eaf4b4
1 parent 5c5b0f6
commit 7eaf4b4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
@@ -10,7 +10,7 @@ gnome.gtkdoc('umockdev',
   content_files: [version_xml],
   gobject_typesfile: 'umockdev.types',
   scan_args: ['--ignore-decorators', 'VALA_EXTERN'],
-  ignore_headers: ['uevent_sender.h', 'ioctl.h', 'ioctl_tree.h', 'debug.h'],
+  ignore_headers: ['uevent_sender.h', 'cros_ec.h', 'ioctl_tree.h', 'debug.h'],
   dependencies: [glib, gobject, declare_dependency(link_with : [umockdev_lib])],
   install: true,
 )
diff --git a/src/ioctl.h → src/cros_ec.h b/src/ioctl.h → src/cros_ec.h
@@ -1,5 +1,5 @@
-#ifndef __IOCTL_H
-#define __IOCTL_H
+#ifndef __CROS_EC_H
+#define __CROS_EC_H
 
 #include <stdint.h>
 

diff --git a/src/ioctl.vapi b/src/ioctl.vapi
@@ -132,9 +132,9 @@ namespace Ioctl {
 		uint8 value[HID_MAX_DESCRIPTOR_SIZE];
 	}
 
-  [CCode (cheader_filename = "ioctl.h")]
+  [CCode (cheader_filename = "cros_ec.h")]
   public const int CROS_EC_DEV_IOCXCMD_V2;
-  [CCode (cname = "struct cros_ec_command_v2", cheader_filename = "ioctl.h")]
+  [CCode (cname = "struct cros_ec_command_v2", cheader_filename = "cros_ec.h")]
   public struct cros_ec_command_v2 {
     uint32 version;
     uint32 command;

diff --git a/src/ioctl_tree.c b/src/ioctl_tree.c
@@ -29,7 +29,7 @@
 
 #include "debug.h"
 #include "utils.h"
-#include "ioctl.h"
+#include "cros_ec.h"
 #include "ioctl_tree.h"
 
 #define TRUE 1