Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace C identifier lists with (void) (#809)

Browse Source 
These changes were generated by wpilibsuite/styleguide#106.
This commit is contained in:
Tyler Veness
2017-12-04 20:05:51 -08:00
committed by Peter Johnson
parent 59c4984ed6
commit e9e407a87d
10 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/src/main/native/athena/Accelerometer.cpp
View File

@@ -219,7 +219,7 @@ void HAL_SetAccelerometerRange(HAL_AccelerometerRange range) {
* *
* This is a floating point value in units of 1 g-force * This is a floating point value in units of 1 g-force
*/ */
double HAL_GetAccelerometerX() { double HAL_GetAccelerometerX(void) {
initializeAccelerometer(); initializeAccelerometer();
int32_t raw = int32_t raw =
@@ -232,7 +232,7 @@ double HAL_GetAccelerometerX() {
* *
* This is a floating point value in units of 1 g-force * This is a floating point value in units of 1 g-force
*/ */
double HAL_GetAccelerometerY() { double HAL_GetAccelerometerY(void) {
initializeAccelerometer(); initializeAccelerometer();
int32_t raw = int32_t raw =
@@ -245,7 +245,7 @@ double HAL_GetAccelerometerY() {
* *
* This is a floating point value in units of 1 g-force * This is a floating point value in units of 1 g-force
*/ */
double HAL_GetAccelerometerZ() { double HAL_GetAccelerometerZ(void) {
initializeAccelerometer(); initializeAccelerometer();
int32_t raw = int32_t raw =

8
hal/src/main/native/athena/HAL.cpp
View File

@@ -177,7 +177,7 @@ const char* HAL_GetErrorMessage(int32_t code) {
/** /**
* Returns the runtime type of this HAL * Returns the runtime type of this HAL
*/ */
HAL_RuntimeType HAL_GetRuntimeType() { return HAL_Athena; } HAL_RuntimeType HAL_GetRuntimeType(void) { return HAL_Athena; }
/** /**
* Return the FPGA Version number. * Return the FPGA Version number.
@@ -388,8 +388,8 @@ int64_t HAL_Report(int32_t resource, int32_t instanceNumber, int32_t context,
// TODO: HACKS // TODO: HACKS
// No need for header definitions, as we should not run from user code. // No need for header definitions, as we should not run from user code.
void NumericArrayResize() {} void NumericArrayResize(void) {}
void RTSetCleanupProc() {} void RTSetCleanupProc(void) {}
void EDVR_CreateReference() {} void EDVR_CreateReference(void) {}
} // extern "C" } // extern "C"

2
hal/src/main/native/athena/SPI.cpp
View File

@@ -98,7 +98,7 @@ static void CommonSPIPortInit(int32_t* status) {
} }
} }
static void CommonSPIPortFree() { static void CommonSPIPortFree(void) {
if (spiPortCount.fetch_sub(1) == 1) { if (spiPortCount.fetch_sub(1) == 1) {
// Clean up SPI Handles // Clean up SPI Handles
HAL_FreeDIOPort(digitalHandles[3]); HAL_FreeDIOPort(digitalHandles[3]);

2
hal/src/main/native/include/HAL/HAL.h
View File

@@ -54,7 +54,7 @@ const char* HAL_GetErrorMessage(int32_t code);
int32_t HAL_GetFPGAVersion(int32_t* status); int32_t HAL_GetFPGAVersion(int32_t* status);
int64_t HAL_GetFPGARevision(int32_t* status); int64_t HAL_GetFPGARevision(int32_t* status);
HAL_RuntimeType HAL_GetRuntimeType(); HAL_RuntimeType HAL_GetRuntimeType(void);
HAL_Bool HAL_GetFPGAButton(int32_t* status); HAL_Bool HAL_GetFPGAButton(int32_t* status);
HAL_Bool HAL_GetSystemActive(int32_t* status); HAL_Bool HAL_GetSystemActive(int32_t* status);

2
hal/src/main/native/include/MockData/CanData.h
View File

@@ -43,7 +43,7 @@ typedef void (*HAL_CAN_GetCANStatusCallback)(
extern "C" { extern "C" {
#endif #endif
void HALSIM_ResetCanData(); void HALSIM_ResetCanData(void);
int32_t HALSIM_RegisterCanSendMessageCallback( int32_t HALSIM_RegisterCanSendMessageCallback(
HAL_CAN_SendMessageCallback callback, void* param); HAL_CAN_SendMessageCallback callback, void* param);

16
hal/src/main/native/include/MockData/DriverStationData.h
View File

@@ -20,52 +20,52 @@ int32_t HALSIM_RegisterDriverStationEnabledCallback(HAL_NotifyCallback callback,
void* param, void* param,
HAL_Bool initialNotify); HAL_Bool initialNotify);
void HALSIM_CancelDriverStationEnabledCallback(int32_t uid); void HALSIM_CancelDriverStationEnabledCallback(int32_t uid);
HAL_Bool HALSIM_GetDriverStationEnabled(); HAL_Bool HALSIM_GetDriverStationEnabled(void);
void HALSIM_SetDriverStationEnabled(HAL_Bool enabled); void HALSIM_SetDriverStationEnabled(HAL_Bool enabled);
int32_t HALSIM_RegisterDriverStationAutonomousCallback( int32_t HALSIM_RegisterDriverStationAutonomousCallback(
HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify); HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify);
void HALSIM_CancelDriverStationAutonomousCallback(int32_t uid); void HALSIM_CancelDriverStationAutonomousCallback(int32_t uid);
HAL_Bool HALSIM_GetDriverStationAutonomous(); HAL_Bool HALSIM_GetDriverStationAutonomous(void);
void HALSIM_SetDriverStationAutonomous(HAL_Bool autonomous); void HALSIM_SetDriverStationAutonomous(HAL_Bool autonomous);
int32_t HALSIM_RegisterDriverStationTestCallback(HAL_NotifyCallback callback, int32_t HALSIM_RegisterDriverStationTestCallback(HAL_NotifyCallback callback,
void* param, void* param,
HAL_Bool initialNotify); HAL_Bool initialNotify);
void HALSIM_CancelDriverStationTestCallback(int32_t uid); void HALSIM_CancelDriverStationTestCallback(int32_t uid);
HAL_Bool HALSIM_GetDriverStationTest(); HAL_Bool HALSIM_GetDriverStationTest(void);
void HALSIM_SetDriverStationTest(HAL_Bool test); void HALSIM_SetDriverStationTest(HAL_Bool test);
int32_t HALSIM_RegisterDriverStationEStopCallback(HAL_NotifyCallback callback, int32_t HALSIM_RegisterDriverStationEStopCallback(HAL_NotifyCallback callback,
void* param, void* param,
HAL_Bool initialNotify); HAL_Bool initialNotify);
void HALSIM_CancelDriverStationEStopCallback(int32_t uid); void HALSIM_CancelDriverStationEStopCallback(int32_t uid);
HAL_Bool HALSIM_GetDriverStationEStop(); HAL_Bool HALSIM_GetDriverStationEStop(void);
void HALSIM_SetDriverStationEStop(HAL_Bool eStop); void HALSIM_SetDriverStationEStop(HAL_Bool eStop);
int32_t HALSIM_RegisterDriverStationFmsAttachedCallback( int32_t HALSIM_RegisterDriverStationFmsAttachedCallback(
HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify); HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify);
void HALSIM_CancelDriverStationFmsAttachedCallback(int32_t uid); void HALSIM_CancelDriverStationFmsAttachedCallback(int32_t uid);
HAL_Bool HALSIM_GetDriverStationFmsAttached(); HAL_Bool HALSIM_GetDriverStationFmsAttached(void);
void HALSIM_SetDriverStationFmsAttached(HAL_Bool fmsAttached); void HALSIM_SetDriverStationFmsAttached(HAL_Bool fmsAttached);
int32_t HALSIM_RegisterDriverStationDsAttachedCallback( int32_t HALSIM_RegisterDriverStationDsAttachedCallback(
HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify); HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify);
void HALSIM_CancelDriverStationDsAttachedCallback(int32_t uid); void HALSIM_CancelDriverStationDsAttachedCallback(int32_t uid);
HAL_Bool HALSIM_GetDriverStationDsAttached(); HAL_Bool HALSIM_GetDriverStationDsAttached(void);
void HALSIM_SetDriverStationDsAttached(HAL_Bool dsAttached); void HALSIM_SetDriverStationDsAttached(HAL_Bool dsAttached);
int32_t HALSIM_RegisterDriverStationAllianceStationIdCallback( int32_t HALSIM_RegisterDriverStationAllianceStationIdCallback(
HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify); HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify);
void HALSIM_CancelDriverStationAllianceStationIdCallback(int32_t uid); void HALSIM_CancelDriverStationAllianceStationIdCallback(int32_t uid);
HAL_AllianceStationID HALSIM_GetDriverStationAllianceStationId(); HAL_AllianceStationID HALSIM_GetDriverStationAllianceStationId(void);
void HALSIM_SetDriverStationAllianceStationId( void HALSIM_SetDriverStationAllianceStationId(
HAL_AllianceStationID allianceStationId); HAL_AllianceStationID allianceStationId);
int32_t HALSIM_RegisterDriverStationMatchTimeCallback( int32_t HALSIM_RegisterDriverStationMatchTimeCallback(
HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify); HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify);
void HALSIM_CancelDriverStationMatchTimeCallback(int32_t uid); void HALSIM_CancelDriverStationMatchTimeCallback(int32_t uid);
double HALSIM_GetDriverStationMatchTime(); double HALSIM_GetDriverStationMatchTime(void);
void HALSIM_SetDriverStationMatchTime(double matchTime); void HALSIM_SetDriverStationMatchTime(double matchTime);
void HALSIM_SetJoystickAxes(int32_t joystickNum, const HAL_JoystickAxes* axes); void HALSIM_SetJoystickAxes(int32_t joystickNum, const HAL_JoystickAxes* axes);

4
hal/src/main/native/sim/DriverStation.cpp
View File

@@ -199,7 +199,9 @@ void HAL_ObserveUserProgramTest(void) {
static pthread_key_t lastCountKey; static pthread_key_t lastCountKey;
static pthread_once_t lastCountKeyOnce = PTHREAD_ONCE_INIT; static pthread_once_t lastCountKeyOnce = PTHREAD_ONCE_INIT;
static void InitLastCountKey() { pthread_key_create(&lastCountKey, std::free); } static void InitLastCountKey(void) {
pthread_key_create(&lastCountKey, std::free);
}
#endif #endif
bool HAL_IsNewControlData(void) { bool HAL_IsNewControlData(void) {

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

@@ -149,7 +149,7 @@ const char* HAL_GetErrorMessage(int32_t code) {
/** /**
* Returns the runtime type of this HAL * Returns the runtime type of this HAL
*/ */
HAL_RuntimeType HAL_GetRuntimeType() { return HAL_Mock; } HAL_RuntimeType HAL_GetRuntimeType(void) { return HAL_Mock; }
/** /**
* Return the FPGA Version number. * Return the FPGA Version number.

2
hal/src/main/native/sim/MockData/CanDataInternal.cpp
View File

@@ -233,7 +233,7 @@ void CanData::CancelGetCANStatusCallback(int32_t uid) {
extern "C" { extern "C" {
void HALSIM_ResetCanData() { SimCanData.ResetData(); } void HALSIM_ResetCanData(void) { SimCanData.ResetData(); }
int32_t HALSIM_RegisterCanSendMessageCallback( int32_t HALSIM_RegisterCanSendMessageCallback(
HAL_CAN_SendMessageCallback callback, void* param) { HAL_CAN_SendMessageCallback callback, void* param) {

16
hal/src/main/native/sim/MockData/DriverStationData.cpp
View File

@@ -466,7 +466,7 @@ int32_t HALSIM_RegisterDriverStationEnabledCallback(HAL_NotifyCallback callback,
void HALSIM_CancelDriverStationEnabledCallback(int32_t uid) { void HALSIM_CancelDriverStationEnabledCallback(int32_t uid) {
SimDriverStationData.CancelEnabledCallback(uid); SimDriverStationData.CancelEnabledCallback(uid);
} }
HAL_Bool HALSIM_GetDriverStationEnabled() { HAL_Bool HALSIM_GetDriverStationEnabled(void) {
return SimDriverStationData.GetEnabled(); return SimDriverStationData.GetEnabled();
} }
void HALSIM_SetDriverStationEnabled(HAL_Bool enabled) { void HALSIM_SetDriverStationEnabled(HAL_Bool enabled) {
@@ -481,7 +481,7 @@ int32_t HALSIM_RegisterDriverStationAutonomousCallback(
void HALSIM_CancelDriverStationAutonomousCallback(int32_t uid) { void HALSIM_CancelDriverStationAutonomousCallback(int32_t uid) {
SimDriverStationData.CancelAutonomousCallback(uid); SimDriverStationData.CancelAutonomousCallback(uid);
} }
HAL_Bool HALSIM_GetDriverStationAutonomous() { HAL_Bool HALSIM_GetDriverStationAutonomous(void) {
return SimDriverStationData.GetAutonomous(); return SimDriverStationData.GetAutonomous();
} }
void HALSIM_SetDriverStationAutonomous(HAL_Bool autonomous) { void HALSIM_SetDriverStationAutonomous(HAL_Bool autonomous) {
@@ -497,7 +497,7 @@ int32_t HALSIM_RegisterDriverStationTestCallback(HAL_NotifyCallback callback,
void HALSIM_CancelDriverStationTestCallback(int32_t uid) { void HALSIM_CancelDriverStationTestCallback(int32_t uid) {
SimDriverStationData.CancelTestCallback(uid); SimDriverStationData.CancelTestCallback(uid);
} }
HAL_Bool HALSIM_GetDriverStationTest() { HAL_Bool HALSIM_GetDriverStationTest(void) {
return SimDriverStationData.GetTest(); return SimDriverStationData.GetTest();
} }
void HALSIM_SetDriverStationTest(HAL_Bool test) { void HALSIM_SetDriverStationTest(HAL_Bool test) {
@@ -513,7 +513,7 @@ int32_t HALSIM_RegisterDriverStationEStopCallback(HAL_NotifyCallback callback,
void HALSIM_CancelDriverStationEStopCallback(int32_t uid) { void HALSIM_CancelDriverStationEStopCallback(int32_t uid) {
SimDriverStationData.CancelEStopCallback(uid); SimDriverStationData.CancelEStopCallback(uid);
} }
HAL_Bool HALSIM_GetDriverStationEStop() { HAL_Bool HALSIM_GetDriverStationEStop(void) {
return SimDriverStationData.GetEStop(); return SimDriverStationData.GetEStop();
} }
void HALSIM_SetDriverStationEStop(HAL_Bool eStop) { void HALSIM_SetDriverStationEStop(HAL_Bool eStop) {
@@ -528,7 +528,7 @@ int32_t HALSIM_RegisterDriverStationFmsAttachedCallback(
void HALSIM_CancelDriverStationFmsAttachedCallback(int32_t uid) { void HALSIM_CancelDriverStationFmsAttachedCallback(int32_t uid) {
SimDriverStationData.CancelFmsAttachedCallback(uid); SimDriverStationData.CancelFmsAttachedCallback(uid);
} }
HAL_Bool HALSIM_GetDriverStationFmsAttached() { HAL_Bool HALSIM_GetDriverStationFmsAttached(void) {
return SimDriverStationData.GetFmsAttached(); return SimDriverStationData.GetFmsAttached();
} }
void HALSIM_SetDriverStationFmsAttached(HAL_Bool fmsAttached) { void HALSIM_SetDriverStationFmsAttached(HAL_Bool fmsAttached) {
@@ -543,7 +543,7 @@ int32_t HALSIM_RegisterDriverStationDsAttachedCallback(
void HALSIM_CancelDriverStationDsAttachedCallback(int32_t uid) { void HALSIM_CancelDriverStationDsAttachedCallback(int32_t uid) {
SimDriverStationData.CancelDsAttachedCallback(uid); SimDriverStationData.CancelDsAttachedCallback(uid);
} }
HAL_Bool HALSIM_GetDriverStationDsAttached() { HAL_Bool HALSIM_GetDriverStationDsAttached(void) {
return SimDriverStationData.GetDsAttached(); return SimDriverStationData.GetDsAttached();
} }
void HALSIM_SetDriverStationDsAttached(HAL_Bool dsAttached) { void HALSIM_SetDriverStationDsAttached(HAL_Bool dsAttached) {
@@ -558,7 +558,7 @@ int32_t HALSIM_RegisterDriverStationAllianceStationIdCallback(
void HALSIM_CancelDriverStationAllianceStationIdCallback(int32_t uid) { void HALSIM_CancelDriverStationAllianceStationIdCallback(int32_t uid) {
SimDriverStationData.CancelAllianceStationIdCallback(uid); SimDriverStationData.CancelAllianceStationIdCallback(uid);
} }
HAL_AllianceStationID HALSIM_GetDriverStationAllianceStationId() { HAL_AllianceStationID HALSIM_GetDriverStationAllianceStationId(void) {
return SimDriverStationData.GetAllianceStationId(); return SimDriverStationData.GetAllianceStationId();
} }
void HALSIM_SetDriverStationAllianceStationId( void HALSIM_SetDriverStationAllianceStationId(
@@ -574,7 +574,7 @@ int32_t HALSIM_RegisterDriverStationMatchTimeCallback(
void HALSIM_CancelDriverStationMatchTimeCallback(int32_t uid) { void HALSIM_CancelDriverStationMatchTimeCallback(int32_t uid) {
SimDriverStationData.CancelMatchTimeCallback(uid); SimDriverStationData.CancelMatchTimeCallback(uid);
} }
double HALSIM_GetDriverStationMatchTime() { double HALSIM_GetDriverStationMatchTime(void) {
return SimDriverStationData.GetMatchTime(); return SimDriverStationData.GetMatchTime();
} }
void HALSIM_SetDriverStationMatchTime(double matchTime) { void HALSIM_SetDriverStationMatchTime(double matchTime) {