From 4305b2ab2db9e45e6b2085b6f9096b2fa3a307ad Mon Sep 17 00:00:00 2001
From: "Neil R. Spruit" <neil.r.spruit@intel.com>
Date: Fri, 22 Nov 2024 07:43:02 -0800
Subject: [PATCH] Have single ze_handle_t and update .rst docs

Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
---
 include/ze_ddi.h        |  6 ------
 include/ze_ddi_common.h | 36 ++++++++++++++++++++++++++++++++++++
 include/zes_ddi.h       |  6 ------
 include/zet_ddi.h       |  6 ------
 4 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 include/ze_ddi_common.h

diff --git a/include/ze_ddi.h b/include/ze_ddi.h
index b4c294d9..09929b2d 100644
--- a/include/ze_ddi.h
+++ b/include/ze_ddi.h
@@ -2609,12 +2609,6 @@ typedef struct _ze_dditable_driver_t
     ze_fabric_edge_exp_dditable_t *     FabricEdgeExp;
 } ze_dditable_driver_t;
 
-/// @brief Handle with pointer to Dispatch Container allocated by the driver at the beginning of every ZE handle
-typedef struct _ze_handle_t
-{
-    ze_dditable_driver_t *pDispatch; // [in] pointer to _ze_dditable_t_ object related to this handle
-} ze_handle_t;
-
 #if defined(__cplusplus)
 } // extern "C"
 #endif
diff --git a/include/ze_ddi_common.h b/include/ze_ddi_common.h
new file mode 100644
index 00000000..4ee20995
--- /dev/null
+++ b/include/ze_ddi_common.h
@@ -0,0 +1,36 @@
+/*
+ *
+ * Copyright (C) 2024 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * @file ze_ddi_common.h
+ * @version v1.12-r1.11.11
+ *
+ */
+#ifndef _ZE_DDI_COMMON_H
+#define _ZE_DDI_COMMON_H
+#if defined(__cplusplus)
+#pragma once
+#endif
+#include "ze_ddi.h"
+#include "zet_ddi.h"
+#include "zes_ddi.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/// @brief Handle with pointers to Dispatch Tables allocated by the driver at the beginning of every L0 object handle.
+typedef struct _ze_handle_t
+{
+    ze_dditable_driver_t *pCore; // [in] pointer to _ze_dditable_t_ object related to this handle
+    zet_dditable_driver_t *pTools; // [in] pointer to _zet_dditable_t_ object related to this handle
+    zes_dditable_driver_t *pSysman; // [in] pointer to _zes_dditable_t_ object related to this handle
+} ze_handle_t;
+
+#if defined(__cplusplus)
+} // extern "C"
+#endif
+
+#endif // _ZE_DDI_COMMON_H
\ No newline at end of file
diff --git a/include/zes_ddi.h b/include/zes_ddi.h
index 8ee5bd95..aecdcf81 100644
--- a/include/zes_ddi.h
+++ b/include/zes_ddi.h
@@ -2013,12 +2013,6 @@ typedef struct _zes_dditable_driver_t
     zes_vf_management_exp_dditable_t *  VFManagementExp;
 } zes_dditable_driver_t;
 
-/// @brief Handle with pointer to Dispatch Container allocated by the driver at the beginning of every ZES handle
-typedef struct _zes_handle_t
-{
-    zes_dditable_driver_t *pDispatch; // [in] pointer to _zes_dditable_t_ object related to this handle
-} zes_handle_t;
-
 #if defined(__cplusplus)
 } // extern "C"
 #endif
diff --git a/include/zet_ddi.h b/include/zet_ddi.h
index eb29d05b..a57bf073 100644
--- a/include/zet_ddi.h
+++ b/include/zet_ddi.h
@@ -1190,12 +1190,6 @@ typedef struct _zet_dditable_driver_t
     zet_debug_dditable_t *              Debug;
 } zet_dditable_driver_t;
 
-/// @brief Handle with pointer to Dispatch Container allocated by the driver at the beginning of every ZET handle
-typedef struct _zet_handle_t
-{
-    zet_dditable_driver_t *pDispatch; // [in] pointer to _zet_dditable_t_ object related to this handle
-} zet_handle_t;
-
 #if defined(__cplusplus)
 } // extern "C"
 #endif