From 6f1ef82c3d0129725bfb7ca42297700e892bb157 Mon Sep 17 00:00:00 2001 From: shatty Date: Sat, 6 Dec 2003 23:56:41 +0000 Subject: [PATCH] move global data into engine git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5597 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/neomagic/Jamfile | 1 - src/add-ons/accelerants/neomagic/acc_std.h | 2 +- src/add-ons/accelerants/neomagic/engine/Jamfile | 1 + .../accelerants/neomagic/{GlobalData.c => engine/nm_globals.c} | 2 +- .../accelerants/neomagic/{global.h => engine/nm_globals.h} | 0 src/add-ons/accelerants/neomagic/engine/nm_std.h | 2 +- src/add-ons/accelerants/nvidia/Jamfile | 1 - src/add-ons/accelerants/nvidia/acc_std.h | 2 +- src/add-ons/accelerants/nvidia/engine/Jamfile | 1 + .../accelerants/nvidia/{GlobalData.c => engine/nv_globals.c} | 2 +- .../accelerants/nvidia/{global.h => engine/nv_globals.h} | 0 src/add-ons/accelerants/nvidia/engine/nv_std.h | 2 +- 12 files changed, 8 insertions(+), 8 deletions(-) rename src/add-ons/accelerants/neomagic/{GlobalData.c => engine/nm_globals.c} (96%) rename src/add-ons/accelerants/neomagic/{global.h => engine/nm_globals.h} (100%) rename src/add-ons/accelerants/nvidia/{GlobalData.c => engine/nv_globals.c} (95%) rename src/add-ons/accelerants/nvidia/{global.h => engine/nv_globals.h} (100%) diff --git a/src/add-ons/accelerants/neomagic/Jamfile b/src/add-ons/accelerants/neomagic/Jamfile index 91d4b980f0..af0bfff7b4 100644 --- a/src/add-ons/accelerants/neomagic/Jamfile +++ b/src/add-ons/accelerants/neomagic/Jamfile @@ -13,7 +13,6 @@ Addon nm.accelerant : accelerants : GetDeviceInfo.c GetModeInfo.c GetTimingConstraints.c - GlobalData.c InitAccelerant.c Overlay.c ProposeDisplayMode.c diff --git a/src/add-ons/accelerants/neomagic/acc_std.h b/src/add-ons/accelerants/neomagic/acc_std.h index 70307ff6e1..3319313662 100644 --- a/src/add-ons/accelerants/neomagic/acc_std.h +++ b/src/add-ons/accelerants/neomagic/acc_std.h @@ -9,7 +9,7 @@ #include #include #include "DriverInterface.h" -#include "global.h" +#include "nm_globals.h" #include "nm_proto.h" #include "be_driver_proto.h" diff --git a/src/add-ons/accelerants/neomagic/engine/Jamfile b/src/add-ons/accelerants/neomagic/engine/Jamfile index ebc682fa81..1c098c6117 100644 --- a/src/add-ons/accelerants/neomagic/engine/Jamfile +++ b/src/add-ons/accelerants/neomagic/engine/Jamfile @@ -10,6 +10,7 @@ StaticLibrary neomagic_engine : nm_crtc.c nm_dac.c nm_general.c + nm_globals.c nm_info.c nm_support.c ; diff --git a/src/add-ons/accelerants/neomagic/GlobalData.c b/src/add-ons/accelerants/neomagic/engine/nm_globals.c similarity index 96% rename from src/add-ons/accelerants/neomagic/GlobalData.c rename to src/add-ons/accelerants/neomagic/engine/nm_globals.c index 242ad68286..41589c6626 100644 --- a/src/add-ons/accelerants/neomagic/GlobalData.c +++ b/src/add-ons/accelerants/neomagic/engine/nm_globals.c @@ -7,7 +7,7 @@ Rudolf Cornelissen 4/2003- */ -#include "acc_std.h" +#include "nm_std.h" int fd; shared_info *si; diff --git a/src/add-ons/accelerants/neomagic/global.h b/src/add-ons/accelerants/neomagic/engine/nm_globals.h similarity index 100% rename from src/add-ons/accelerants/neomagic/global.h rename to src/add-ons/accelerants/neomagic/engine/nm_globals.h diff --git a/src/add-ons/accelerants/neomagic/engine/nm_std.h b/src/add-ons/accelerants/neomagic/engine/nm_std.h index 70044d2c39..5915d759cb 100644 --- a/src/add-ons/accelerants/neomagic/engine/nm_std.h +++ b/src/add-ons/accelerants/neomagic/engine/nm_std.h @@ -3,6 +3,6 @@ #include #include #include "DriverInterface.h" -#include "global.h" +#include "nm_globals.h" #include "nm_proto.h" #include "nm_macros.h" diff --git a/src/add-ons/accelerants/nvidia/Jamfile b/src/add-ons/accelerants/nvidia/Jamfile index 73cdab84bd..777b1bc485 100644 --- a/src/add-ons/accelerants/nvidia/Jamfile +++ b/src/add-ons/accelerants/nvidia/Jamfile @@ -13,7 +13,6 @@ Addon nv.accelerant : accelerants : GetDeviceInfo.c GetModeInfo.c GetTimingConstraints.c - GlobalData.c InitAccelerant.c Overlay.c ProposeDisplayMode.c diff --git a/src/add-ons/accelerants/nvidia/acc_std.h b/src/add-ons/accelerants/nvidia/acc_std.h index b4559bf824..560ab04a67 100644 --- a/src/add-ons/accelerants/nvidia/acc_std.h +++ b/src/add-ons/accelerants/nvidia/acc_std.h @@ -9,7 +9,7 @@ #include #include #include "DriverInterface.h" -#include "global.h" +#include "nv_globals.h" //apsed #include "nv_extern.h" #include "nv_proto.h" #include "be_driver_proto.h" diff --git a/src/add-ons/accelerants/nvidia/engine/Jamfile b/src/add-ons/accelerants/nvidia/engine/Jamfile index 54d0c4cdb6..ed5f4eb23a 100644 --- a/src/add-ons/accelerants/nvidia/engine/Jamfile +++ b/src/add-ons/accelerants/nvidia/engine/Jamfile @@ -11,6 +11,7 @@ StaticLibrary nvidia_engine : nv_crtc2.c nv_dac.c nv_general.c + nv_globals.c nv_i2c.c nv_info.c nv_maven.c diff --git a/src/add-ons/accelerants/nvidia/GlobalData.c b/src/add-ons/accelerants/nvidia/engine/nv_globals.c similarity index 95% rename from src/add-ons/accelerants/nvidia/GlobalData.c rename to src/add-ons/accelerants/nvidia/engine/nv_globals.c index d3a2e22aec..bf29cbf4a0 100644 --- a/src/add-ons/accelerants/nvidia/GlobalData.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_globals.c @@ -6,7 +6,7 @@ Mark Watson */ -#include "acc_std.h" +#include "nv_std.h" int fd; shared_info *si; diff --git a/src/add-ons/accelerants/nvidia/global.h b/src/add-ons/accelerants/nvidia/engine/nv_globals.h similarity index 100% rename from src/add-ons/accelerants/nvidia/global.h rename to src/add-ons/accelerants/nvidia/engine/nv_globals.h diff --git a/src/add-ons/accelerants/nvidia/engine/nv_std.h b/src/add-ons/accelerants/nvidia/engine/nv_std.h index 82afcc4b7e..3a8200ab0a 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_std.h +++ b/src/add-ons/accelerants/nvidia/engine/nv_std.h @@ -3,7 +3,7 @@ #include #include #include "DriverInterface.h" -#include "global.h" +#include "nv_globals.h" //apsed #include "nv_extern.h" #include "nv_proto.h" #include "nv_macros.h"