Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCRIPT namespace replacements

Browse Source
This commit is contained in:
PJ Reiniger
2025-11-07 20:00:05 -05:00
committed by Peter Johnson
parent ae6c043632
commit 9aca8e0fd6
2622 changed files with 22275 additions and 22275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hal/src/main/native/sim/HAL.cpp
View File

@@ -32,7 +32,7 @@ NtQueryTimerResolution(PULONG MinimumResolution, PULONG MaximumResolution,
#include "wpi/util/mutex.hpp"
#include "wpi/util/spinlock.hpp"
using namespace hal;
using namespace wpi::hal;
namespace {
class SimPeriodicCallbackRegistry : public impl::SimCallbackRegistryBase {
@@ -54,16 +54,16 @@ class SimPeriodicCallbackRegistry : public impl::SimCallbackRegistryBase {
} // namespace
static HAL_RuntimeType runtimeType{HAL_Runtime_Simulation};
static wpi::spinlock gOnShutdownMutex;
static wpi::util::spinlock gOnShutdownMutex;
static std::vector<std::pair<void*, void (*)(void*)>> gOnShutdown;
static SimPeriodicCallbackRegistry gSimPeriodicBefore;
static SimPeriodicCallbackRegistry gSimPeriodicAfter;
namespace hal {
namespace wpi::hal {
void InitializeDriverStation();
} // namespace hal
} // namespace wpi::hal
namespace hal::init {
namespace wpi::hal::init {
void InitializeHAL() {
InitializeAddressableLEDData();
InitializeAnalogInData();
@@ -107,7 +107,7 @@ void InitializeHAL() {
InitializeSimDevice();
InitializeThreads();
}
} // namespace hal::init
} // namespace wpi::hal::init
extern "C" {
@@ -253,7 +253,7 @@ int32_t HAL_GetTeamNumber(void) {
}
uint64_t HAL_GetFPGATime(int32_t* status) {
return hal::GetFPGATime();
return wpi::hal::GetFPGATime();
}
uint64_t HAL_ExpandFPGATime(uint32_t unexpandedLower, int32_t* status) {
@@ -302,7 +302,7 @@ HAL_Bool HAL_GetSystemTimeValid(int32_t* status) {
HAL_Bool HAL_Initialize(int32_t timeout, int32_t mode) {
static std::atomic_bool initialized{false};
static wpi::mutex initializeMutex;
static wpi::util::mutex initializeMutex;
// Initial check, as if it's true initialization has finished
if (initialized) {
return true;
@@ -314,12 +314,12 @@ HAL_Bool HAL_Initialize(int32_t timeout, int32_t mode) {
return true;
}
hal::init::InitializeHAL();
wpi::hal::init::InitializeHAL();
hal::init::HAL_IsInitialized.store(true);
wpi::hal::init::HAL_IsInitialized.store(true);
hal::RestartTiming();
hal::InitializeDriverStation();
wpi::hal::RestartTiming();
wpi::hal::InitializeDriverStation();
initialized = true;