gma connectors: Add `Pipe' parameter to Pre_/Post_Off procedures
Change-Id: I01dbf3cae3dfef2130fa10116f70f23238c7a48c
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.sourcearcade.org/c/libgfxinit/+/467
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: Nico Huber <nico.h@gmx.de>
diff --git a/common/g45/hw-gfx-gma-connectors.adb b/common/g45/hw-gfx-gma-connectors.adb
index 6282df7..fe8c3c5 100644
--- a/common/g45/hw-gfx-gma-connectors.adb
+++ b/common/g45/hw-gfx-gma-connectors.adb
@@ -80,7 +80,7 @@
----------------------------------------------------------------------------
- procedure Pre_Off (Port_Cfg : Port_Config)
+ procedure Pre_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config)
is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
@@ -89,7 +89,7 @@
Panel.Off (Port_Cfg.Panel);
end Pre_Off;
- procedure Post_Off (Port_Cfg : Port_Config)
+ procedure Post_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config)
is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
diff --git a/common/haswell_shared/hw-gfx-gma-connectors.adb b/common/haswell_shared/hw-gfx-gma-connectors.adb
index fedf660..6419c20 100644
--- a/common/haswell_shared/hw-gfx-gma-connectors.adb
+++ b/common/haswell_shared/hw-gfx-gma-connectors.adb
@@ -82,7 +82,7 @@
----------------------------------------------------------------------------
- procedure Pre_Off (Port_Cfg : Port_Config)
+ procedure Pre_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config)
is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
@@ -91,7 +91,7 @@
Panel.Off (Port_Cfg.Panel);
end Pre_Off;
- procedure Post_Off (Port_Cfg : Port_Config)
+ procedure Post_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config)
is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
diff --git a/common/hw-gfx-gma-connectors.ads b/common/hw-gfx-gma-connectors.ads
index 89b9c6a..5fee0d2 100644
--- a/common/hw-gfx-gma-connectors.ads
+++ b/common/hw-gfx-gma-connectors.ads
@@ -43,10 +43,10 @@
Port_Cfg : in Port_Config;
PLL_Hint : in Word32;
Success : out Boolean);
- pragma Warnings (GNATprove, On, "unused variable ""P*""");
- procedure Pre_Off (Port_Cfg : Port_Config);
- procedure Post_Off (Port_Cfg : Port_Config);
+ procedure Pre_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config);
+ procedure Post_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config);
+ pragma Warnings (GNATprove, On, "unused variable ""P*""");
procedure Pre_All_Off;
procedure Post_All_Off;
diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb
index 2a7b7a6..1def7e9 100644
--- a/common/hw-gfx-gma.adb
+++ b/common/hw-gfx-gma.adb
@@ -208,7 +208,7 @@
if not Success then
Display_Controller.Off (Pipe);
- Connectors.Post_Off (Port_Cfg);
+ Connectors.Post_Off (Pipe, Port_Cfg);
end if;
end if;
@@ -252,9 +252,9 @@
Display_Controller.Legacy_VGA_Off;
end if;
- Connectors.Pre_Off (Port_Cfg);
+ Connectors.Pre_Off (Pipe, Port_Cfg);
Display_Controller.Off (Pipe);
- Connectors.Post_Off (Port_Cfg);
+ Connectors.Post_Off (Pipe, Port_Cfg);
PLLs.Free (Allocated_PLLs (Pipe));
end if;
diff --git a/common/i945/hw-gfx-gma-connectors.adb b/common/i945/hw-gfx-gma-connectors.adb
index 383f7d3..5286f46 100644
--- a/common/i945/hw-gfx-gma-connectors.adb
+++ b/common/i945/hw-gfx-gma-connectors.adb
@@ -71,7 +71,7 @@
----------------------------------------------------------------------------
- procedure Pre_Off (Port_Cfg : Port_Config)
+ procedure Pre_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config)
is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
@@ -80,7 +80,7 @@
Panel.Off (Port_Cfg.Panel);
end Pre_Off;
- procedure Post_Off (Port_Cfg : Port_Config)
+ procedure Post_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config)
is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
diff --git a/common/ironlake/hw-gfx-gma-connectors.adb b/common/ironlake/hw-gfx-gma-connectors.adb
index db8e6d0..11ecdf6 100644
--- a/common/ironlake/hw-gfx-gma-connectors.adb
+++ b/common/ironlake/hw-gfx-gma-connectors.adb
@@ -117,7 +117,7 @@
----------------------------------------------------------------------------
- procedure Pre_Off (Port_Cfg : Port_Config)
+ procedure Pre_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config)
is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
@@ -128,7 +128,7 @@
end if;
end Pre_Off;
- procedure Post_Off (Port_Cfg : Port_Config)
+ procedure Post_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config)
is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
diff --git a/common/tigerlake/hw-gfx-gma-connectors.adb b/common/tigerlake/hw-gfx-gma-connectors.adb
index 35e0692..0870288 100644
--- a/common/tigerlake/hw-gfx-gma-connectors.adb
+++ b/common/tigerlake/hw-gfx-gma-connectors.adb
@@ -64,14 +64,14 @@
Success := True;
end Post_On;
- procedure Pre_Off (Port_Cfg : Port_Config) is
+ procedure Pre_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config) is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
Panel.Backlight_Off (Port_Cfg.Panel);
Panel.Off (Port_Cfg.Panel);
end Pre_Off;
- procedure Post_Off (Port_Cfg : Port_Config) is
+ procedure Post_Off (Pipe : Pipe_Index; Port_Cfg : Port_Config) is
begin
pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));
end Post_Off;