rename ddc_watch_displays.c/h -> ddc_watch_displays_udev.c/h

rockowitz · Oct 19, 2024 · e0d0632 · e0d0632
1 parent 08e3d37
commit e0d0632
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/src/app_ddcutil/app_experimental.c b/src/app_ddcutil/app_experimental.c
@@ -4,6 +4,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <assert.h>
+
 #include <stdio.h>
 #include <strings.h>
 
@@ -12,15 +13,14 @@
 #include "util/timestamp.h"
 
 #include "base/parms.h"
-
 #include "i2c/i2c_bus_core.h"
 #include "i2c/i2c_edid.h"
 #include "i2c/i2c_strategy_dispatcher.h"
 
 #include "ddc/ddc_display_ref_reports.h"
 #include "ddc/ddc_displays.h"
 #include "ddc/ddc_packet_io.h"
-#include "ddc/ddc_watch_displays.h"
+// #include "ddc/ddc_watch_displays_udev.h"
 #include "ddc/ddc_watch_displays_common.h"
 #include "ddc/ddc_watch_displays_main.h"
 

diff --git a/src/app_sysenv/query_sysenv.c b/src/app_sysenv/query_sysenv.c
@@ -61,7 +61,7 @@
 #include "ddc/ddc_display_ref_reports.h"
 #include "ddc/ddc_serialize.h"
 #include "ddc/ddc_try_data.h"
-#include "ddc/ddc_watch_displays.h"
+#include "ddc/ddc_watch_displays_udev.h"
 
 #include "vcp/persistent_capabilities.h"
 

diff --git a/src/ddc/Makefile.am b/src/ddc/Makefile.am
@@ -41,7 +41,7 @@ libddc_la_SOURCES += \
   ddc_watch_displays_common.c \
   ddc_watch_displays_main.c \
   ddc_watch_displays_poll.c \
-  ddc_watch_displays.c
+  ddc_watch_displays_udev.c
 endif
 endif
 

diff --git a/src/ddc/ddc_common_init.c b/src/ddc/ddc_common_init.c
@@ -57,7 +57,7 @@
 #include "ddc_services.h"
 #include "ddc_try_data.h"
 #include "ddc_vcp.h"
-#include "ddc_watch_displays.h"
+#include "ddc/ddc_watch_displays_udev.h"
 #include "ddc_watch_displays_main.h"
 #include "ddc_watch_displays_common.h"
 

diff --git a/src/ddc/ddc_services.c b/src/ddc/ddc_services.c
@@ -57,7 +57,7 @@
 #include "ddc/ddc_vcp.h"
 #include "ddc/ddc_vcp_version.h"
 #ifdef BUILD_SHARED_LIB
-#include "ddc/ddc_watch_displays.h"
+#include "ddc/ddc_watch_displays_udev.h"
 #include "ddc/ddc_watch_displays_poll.h"
 #include "ddc/ddc_watch_displays_main.h"
 #include "ddc/ddc_watch_displays_common.h"
@@ -232,7 +232,7 @@ void init_ddc_services() {
    init_ddc_vcp();
    init_ddc_vcp_version();
 // #ifdef BUILD_SHARED_LIB
-   init_ddc_watch_displays();
+   init_ddc_watch_displays_udev();
    init_ddc_watch_displays_poll();
    init_ddc_watch_displays_common();
    init_ddc_watch_displays_main();

diff --git a/src/ddc/ddc_watch_displays_main.c b/src/ddc/ddc_watch_displays_main.c
@@ -56,7 +56,7 @@
 #include "ddc/ddc_vcp.h"
 
 #include "ddc_watch_displays_common.h"
-#include "ddc_watch_displays.h"
+#include "ddc/ddc_watch_displays_udev.h"
 #include "ddc_watch_displays_poll.h"
 
 #include "ddc_watch_displays_main.h"

diff --git a/src/ddc/ddc_watch_displays.c → src/ddc/ddc_watch_displays_udev.c b/src/ddc/ddc_watch_displays.c → src/ddc/ddc_watch_displays_udev.c
@@ -59,7 +59,7 @@
 #include "ddc/ddc_vcp.h"
 
 #include "ddc/ddc_watch_displays_common.h"
-#include "ddc/ddc_watch_displays.h"
+#include "ddc/ddc_watch_displays_udev.h"
 
 
 // Trace class for this file
@@ -817,7 +817,7 @@ gpointer ddc_watch_displays_udev_i2c(gpointer data) {
 #endif // ENABLE_UDEV
 
 
-void init_ddc_watch_displays() {
+void init_ddc_watch_displays_udev() {
 
 
 #ifdef ENABLE_UDEV

diff --git a/src/ddc/ddc_watch_displays.h → src/ddc/ddc_watch_displays_udev.h b/src/ddc/ddc_watch_displays.h → src/ddc/ddc_watch_displays_udev.h
@@ -3,8 +3,8 @@
 // Copyright (C) 2019-2024 Sanford Rockowitz <[email protected]>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#ifndef DDC_WATCH_DISPLAYS_H_
-#define DDC_WATCH_DISPLAYS_H_
+#ifndef DDC_WATCH_DISPLAYS_UDEV_H_
+#define DDC_WATCH_DISPLAYS_UDEV_H_
 
 /** \cond */
 #include <glib-2.0/glib.h>
@@ -21,6 +21,6 @@ extern int            udev_poll_loop_millisec;
 // bool     is_watch_thread_executing();
 gpointer    ddc_watch_displays_udev_i2c(gpointer data);
 
-void        init_ddc_watch_displays();
+void        init_ddc_watch_displays_udev();
 
-#endif /* DDC_WATCH_DISPLAYS_H_ */
+#endif /* DDC_WATCH_DISPLAYS_UDEV_H_ */
diff --git a/src/ddc/ddc_watch_displays_udev_sysfs.c b/src/ddc/ddc_watch_displays_udev_sysfs.c
@@ -55,8 +55,7 @@
 #include "ddc/ddc_packet_io.h"
 #include "ddc/ddc_status_events.h"
 #include "ddc/ddc_vcp.h"
-
-#include "ddc/ddc_watch_displays.h"
+#include "ddc/ddc_watch_displays_udev.h"
 
 
 

diff --git a/src/libmain/api_displays.c b/src/libmain/api_displays.c
@@ -6,8 +6,9 @@
 #include "config.h"
 
 #include <assert.h>
+
 #include <errno.h>
-#include <i2c/i2c_sys_drm_connector.h>
+
 #include <string.h>
 #include <sys/stat.h>
 
@@ -28,16 +29,16 @@
 #include "base/rtti.h"
 
 #include "i2c/i2c_sysfs_conflicting_drivers.h"
+#include "i2c/i2c_sys_drm_connector.h"
 #include "i2c/i2c_dpms.h"
 
 #include "ddc/ddc_displays.h"
 #include "ddc/ddc_display_ref_reports.h"
 #include "ddc/ddc_display_selection.h"
 #include "ddc/ddc_status_events.h"
 #include "ddc/ddc_packet_io.h"
+#include "ddc/ddc_watch_displays_udev.h"
 #include "ddc/ddc_vcp_version.h"
-#include "ddc/ddc_watch_displays.h"
-
 #include "libmain/api_base_internal.h"
 #include "libmain/api_error_info_internal.h"
 #include "libmain/api_displays_internal.h"