[igt-dev] [PATCH i-g-t 1/5] tools: rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug

[Petri Latvala]

On Thu, Sep 03, 2020 at 05:54:35PM -0700, Abhinav Kumar wrote:
> Rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug so that
> other modules can use the APIs.
> 
> Signed-off-by: Abhinav Kumar <abhinavk at codeaurora.org>

Reviewed-by: Petri Latvala <petri.latvala at intel.com>


> ---
>  tools/Makefile.sources                                   | 4 ++--
>  tools/{intel_dp_compliance.h => igt_dp_compliance.h}     | 5 +++--
>  ..._compliance_hotplug.c => igt_dp_compliance_hotplug.c} | 9 +++++----
>  tools/intel_dp_compliance.c                              | 7 ++++---
>  tools/meson.build                                        | 2 +-
>  5 files changed, 15 insertions(+), 12 deletions(-)
>  rename tools/{intel_dp_compliance.h => igt_dp_compliance.h} (89%)
>  rename tools/{intel_dp_compliance_hotplug.c => igt_dp_compliance_hotplug.c} (93%)
> 
> diff --git a/tools/Makefile.sources b/tools/Makefile.sources
> index b7a43d47..c28bef2f 100644
> --- a/tools/Makefile.sources
> +++ b/tools/Makefile.sources
> @@ -63,8 +63,8 @@ intel_l3_parity_SOURCES =	\
>  
>  intel_dp_compliance_SOURCES = \
>          intel_dp_compliance.c \
> -        intel_dp_compliance.h \
> -        intel_dp_compliance_hotplug.c \
> +        igt_dp_compliance.h \
> +        igt_dp_compliance_hotplug.c \
>          $(NULL)
>  
>  amd_hdmi_compliance_SOURCES = \
> diff --git a/tools/intel_dp_compliance.h b/tools/igt_dp_compliance.h
> similarity index 89%
> rename from tools/intel_dp_compliance.h
> rename to tools/igt_dp_compliance.h
> index 50a9662e..bf2b0701 100644
> --- a/tools/intel_dp_compliance.h
> +++ b/tools/igt_dp_compliance.h
> @@ -1,4 +1,5 @@
>  /*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
>   * Copyright 2017 Intel Corporation
>   * Manasi Navare <manasi.d.navare at intel.com>
>   *
> @@ -28,8 +29,8 @@
>  
>  extern int drm_fd;
>  
> -gboolean intel_dp_compliance_setup_hotplug(void);
> -void intel_dp_compliance_cleanup_hotplug(void);
> +gboolean igt_dp_compliance_setup_hotplug(void);
> +void igt_dp_compliance_cleanup_hotplug(void);
>  
>  /* called by the hotplug code */
>  int update_display(int mode, bool is_compliance_test);
> diff --git a/tools/intel_dp_compliance_hotplug.c b/tools/igt_dp_compliance_hotplug.c
> similarity index 93%
> rename from tools/intel_dp_compliance_hotplug.c
> rename to tools/igt_dp_compliance_hotplug.c
> index b57f8a27..d05e45ca 100644
> --- a/tools/intel_dp_compliance_hotplug.c
> +++ b/tools/igt_dp_compliance_hotplug.c
> @@ -1,4 +1,5 @@
>  /*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
>   * Copyright 2017 Intel Corporation
>   *   Jesse Barnes <jesse.barnes at intel.com>
>   *   Manasi Navare <manasi.d.navare at intel.com>
> @@ -29,7 +30,7 @@
>  
>  #include <sys/stat.h>
>  
> -#include "intel_dp_compliance.h"
> +#include "igt_dp_compliance.h"
>  #include <libudev.h>
>  static struct udev_monitor *uevent_monitor;
>  static struct udev *udev;
> @@ -62,7 +63,7 @@ out:
>  }
>  
>  
> -gboolean intel_dp_compliance_setup_hotplug(void)
> +gboolean igt_dp_compliance_setup_hotplug(void)
>  {
>  	int ret;
>  
> @@ -109,11 +110,11 @@ gboolean intel_dp_compliance_setup_hotplug(void)
>  	return TRUE;
>  
>  out:
> -	intel_dp_compliance_cleanup_hotplug();
> +	igt_dp_compliance_cleanup_hotplug();
>  	return FALSE;
>  }
>  
> -void intel_dp_compliance_cleanup_hotplug(void)
> +void igt_dp_compliance_cleanup_hotplug(void)
>  {
>  	if (udevchannel)
>  		g_io_channel_shutdown(udevchannel, TRUE, NULL);
> diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
> index f26108b5..5c423897 100644
> --- a/tools/intel_dp_compliance.c
> +++ b/tools/intel_dp_compliance.c
> @@ -1,4 +1,5 @@
>  /*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
>   * Copyright © 2017 Intel Corporation
>   *
>   * Permission is hereby granted, free of charge, to any person obtaining a
> @@ -125,7 +126,7 @@
>  #include <fcntl.h>
>  #include <time.h>
>  
> -#include "intel_dp_compliance.h"
> +#include "igt_dp_compliance.h"
>  
>  #include <stdlib.h>
>  #include <signal.h>
> @@ -1067,7 +1068,7 @@ int main(int argc, char **argv)
>  		goto out_close;
>  	}
>  
> -	if (!intel_dp_compliance_setup_hotplug()) {
> +	if (!igt_dp_compliance_setup_hotplug()) {
>  		igt_warn("Failed to initialize hotplug support\n");
>  		goto out_mainloop;
>  	}
> @@ -1108,7 +1109,7 @@ int main(int argc, char **argv)
>  out_stdio:
>  	g_io_channel_shutdown(stdinchannel, TRUE, NULL);
>  out_hotplug:
> -	intel_dp_compliance_cleanup_hotplug();
> +	igt_dp_compliance_cleanup_hotplug();
>  out_mainloop:
>  	g_main_loop_unref(mainloop);
>  out_close:
> diff --git a/tools/meson.build b/tools/meson.build
> index 34f95e79..05f2a172 100644
> --- a/tools/meson.build
> +++ b/tools/meson.build
> @@ -60,7 +60,7 @@ endforeach
>  if libudev.found()
>  	intel_dp_compliance_src = [
>  		'intel_dp_compliance.c',
> -		'intel_dp_compliance_hotplug.c'
> +		'igt_dp_compliance_hotplug.c'
>  	]
>  	executable('intel_dp_compliance', sources : intel_dp_compliance_src,
>  		   dependencies : [tool_deps, libudev],
> -- 
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev