diff --git a/format_include.py b/format_include.py new file mode 100644 index 000000000..2536438ef --- /dev/null +++ b/format_include.py @@ -0,0 +1,71 @@ +from pathlib import Path +import re +import os + +INCLUDE_PATTERN = re.compile(r'^#include (?:<([^<>]+)>|"([^"]+)")', re.MULTILINE) + +LIBRARIES: list[tuple[Path, Path]] = [ + (Path("include/"), Path("src/Game/")), # Game + (Path("libs/JSystem/include/"), Path("src/JSystem/")), # JSystem + (Path("libs/MetroTRK/include/"), Path("src/MetroTRK/")), # MetroTRK + (Path("libs/MSL_C/include/"), Path("src/MSL_C/")), # MSL_C + (Path("libs/MSL_C++/include/"), Path("src/MSL_C++/")), # MSL_C++ + (Path("libs/nw4r/include/"), Path("src/nw4r/")), # nw4r + (Path("libs/Runtime/include/"), Path("src/Runtime/")), # Runtime + (Path("libs/RVL_SDK/include/"), Path("src/RVL_SDK/")), # RVL_SDK + (Path("libs/RVLFaceLib/include/"), Path("src/RVLFaceLib/")), # RVLFaceLib +] + +EXTENSIONS: list[str] = [ + ".c", + ".cpp", + ".h", + ".hpp", +] + +def is_local_include(header: str, local_include_directory: Path) -> bool: + return (local_include_directory / header).exists() + +def format_include(match: re.Match, local_include_directory: Path) -> str: + header: str = match.group(1) or match.group(2) + header = header.replace('\\', '/') + + if is_local_include(header, local_include_directory): + return f'#include "{header}"' + + return f'#include <{header}>' + +def format_file(file_path: Path, local_include_directory: Path) -> None: + with open(file_path, 'r', encoding='utf-8') as f: + text: str = f.read() + + text_replaced: str = INCLUDE_PATTERN.sub(lambda match: format_include(match, local_include_directory), text) + + if text != text_replaced: + with open(file_path, 'w', encoding='utf-8') as f: + f.write(text_replaced) + +def format_files(directory: Path, local_include_directory: Path): + for root, dirs, files in os.walk(directory): + for file in files: + for extension in EXTENSIONS: + if file.endswith(extension): + break + else: + continue + + file_path: Path = Path(os.path.join(root, file)) + + print(f'[{local_include_directory}] Formatting {file_path}') + format_file(file_path, local_include_directory) + +def format_all(): + for (include_directory, source_directory) in LIBRARIES: + if include_directory.is_dir(): + format_files(include_directory, include_directory) + + if source_directory.is_dir(): + format_files(source_directory, include_directory) + +if __name__ == "__main__": + format_all() diff --git a/include/Game/AreaObj/AreaForm.hpp b/include/Game/AreaObj/AreaForm.hpp index f7fbd9f19..887410b94 100644 --- a/include/Game/AreaObj/AreaForm.hpp +++ b/include/Game/AreaObj/AreaForm.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TMatrix.hpp" +#include #include class JMapInfoIter; diff --git a/include/Game/AudioLib.hpp b/include/Game/AudioLib.hpp index 9ca8e10ef..80f308144 100644 --- a/include/Game/AudioLib.hpp +++ b/include/Game/AudioLib.hpp @@ -11,5 +11,5 @@ #include "Game/AudioLib/AudSoundObject.hpp" #include "Game/AudioLib/AudSpeakerWrap.hpp" #include "Game/AudioLib/AudSystem.hpp" -#include "Game/AudioLib/AudSystemWrapper.hpp" +#include #include "Game/AudioLib/AudWrap.hpp" diff --git a/include/Game/AudioLib/AudAudible.hpp b/include/Game/AudioLib/AudAudible.hpp index 1b98c8e93..6c003bdaf 100644 --- a/include/Game/AudioLib/AudAudible.hpp +++ b/include/Game/AudioLib/AudAudible.hpp @@ -1,8 +1,8 @@ #pragma once #include "Game/AudioLib/AudAudience.hpp" -#include "JSystem/JAudio2/JAISound.hpp" -#include "JSystem/JAudio2/JASSoundParams.hpp" +#include +#include #include #include #include diff --git a/include/Game/AudioLib/AudAudience.hpp b/include/Game/AudioLib/AudAudience.hpp index c4d77341e..f4fafac30 100644 --- a/include/Game/AudioLib/AudAudience.hpp +++ b/include/Game/AudioLib/AudAudience.hpp @@ -2,11 +2,11 @@ #include "Game/AudioLib/AudAudible.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JAudio2/JAISound.hpp" -#include "JSystem/JAudio2/JASSoundParams.hpp" -#include "JSystem/JAudio2/JAUAudible.hpp" -#include "JSystem/JAudio2/JAUSoundInfo.hpp" -#include "JSystem/JGeometry/TUtil.hpp" +#include +#include +#include +#include +#include #include #include #include diff --git a/include/Game/AudioLib/AudBgm.hpp b/include/Game/AudioLib/AudBgm.hpp index a2ddd1842..f4cbe0ab5 100644 --- a/include/Game/AudioLib/AudBgm.hpp +++ b/include/Game/AudioLib/AudBgm.hpp @@ -2,7 +2,7 @@ #include "Game/AudioLib/AudBgmRhythmStrategy.hpp" #include "Game/AudioLib/AudTrackController.hpp" -#include "JSystem/JAudio2/JAISound.hpp" +#include class JAISoundID; class AudBgmVolumeController; diff --git a/include/Game/AudioLib/AudMeNameConverter.hpp b/include/Game/AudioLib/AudMeNameConverter.hpp index fbd7fc774..2f94d5f56 100644 --- a/include/Game/AudioLib/AudMeNameConverter.hpp +++ b/include/Game/AudioLib/AudMeNameConverter.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Util/SingletonHolder.hpp" -#include "JSystem/JAudio2/JAISound.hpp" +#include #include struct AudMeNameData { diff --git a/include/Game/AudioLib/AudSoundInfo.hpp b/include/Game/AudioLib/AudSoundInfo.hpp index 6a248a912..e559d8ec6 100644 --- a/include/Game/AudioLib/AudSoundInfo.hpp +++ b/include/Game/AudioLib/AudSoundInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JAudio2/JAUStdSoundInfo.hpp" +#include // TODO: JAUStdSoundInfo or just JAUSoundInfo? class AudSoundInfo : public JAUSoundInfo { diff --git a/include/Game/AudioLib/AudSystem.hpp b/include/Game/AudioLib/AudSystem.hpp index 769fcd210..af9a8559f 100644 --- a/include/Game/AudioLib/AudSystem.hpp +++ b/include/Game/AudioLib/AudSystem.hpp @@ -3,9 +3,9 @@ #include "Game/AudioLib/AudAudience.hpp" #include "Game/AudioLib/AudBgmMgr.hpp" #include "Game/AudioLib/AudLimitedSound.hpp" -#include "JSystem/JAudio2/JAIAudible.hpp" -#include "JSystem/JAudio2/JAIAudience.hpp" -#include "JSystem/JAudio2/JAUStdSoundInfo.hpp" +#include +#include +#include #include #include #include diff --git a/include/Game/Boss/BossStinkBug.hpp b/include/Game/Boss/BossStinkBug.hpp index 907edab78..8a43a9d75 100644 --- a/include/Game/Boss/BossStinkBug.hpp +++ b/include/Game/Boss/BossStinkBug.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class ActorCameraInfo; class ActorJointCtrl; diff --git a/include/Game/Boss/BossStinkBugActionBase.hpp b/include/Game/Boss/BossStinkBugActionBase.hpp index 3410aa332..b4cb7dde2 100644 --- a/include/Game/Boss/BossStinkBugActionBase.hpp +++ b/include/Game/Boss/BossStinkBugActionBase.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/ActorStateBase.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class BossStinkBug; class HitSensor; diff --git a/include/Game/Boss/BossStinkBugFunction.hpp b/include/Game/Boss/BossStinkBugFunction.hpp index 0e597688e..7a5ffe0ff 100644 --- a/include/Game/Boss/BossStinkBugFunction.hpp +++ b/include/Game/Boss/BossStinkBugFunction.hpp @@ -1,7 +1,7 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include class BossStinkBug; class HitSensor; diff --git a/include/Game/Boss/DinoPackunBattleVs2Lv1.hpp b/include/Game/Boss/DinoPackunBattleVs2Lv1.hpp index 6e9ed95a7..752336637 100644 --- a/include/Game/Boss/DinoPackunBattleVs2Lv1.hpp +++ b/include/Game/Boss/DinoPackunBattleVs2Lv1.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Boss/DinoPackunAction.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class DinoPackunStateDamage; class DinoPackunTrackFireHolder; diff --git a/include/Game/Boss/PoltaFunction.hpp b/include/Game/Boss/PoltaFunction.hpp index b16fe1c79..b68eb008f 100644 --- a/include/Game/Boss/PoltaFunction.hpp +++ b/include/Game/Boss/PoltaFunction.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include #include class Polta; diff --git a/include/Game/Boss/PoltaSensorCtrl.hpp b/include/Game/Boss/PoltaSensorCtrl.hpp index 4b93b2391..1358392f6 100644 --- a/include/Game/Boss/PoltaSensorCtrl.hpp +++ b/include/Game/Boss/PoltaSensorCtrl.hpp @@ -1,7 +1,7 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include class Polta; class HitSensor; diff --git a/include/Game/Boss/SkeletalFishJointCalc.hpp b/include/Game/Boss/SkeletalFishJointCalc.hpp index df0462d05..8fadc7b48 100644 --- a/include/Game/Boss/SkeletalFishJointCalc.hpp +++ b/include/Game/Boss/SkeletalFishJointCalc.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TMatrix.hpp" +#include class SkeletalFishRailControl; class JointControllerInfo; diff --git a/include/Game/Camera/CamHeliEffector.hpp b/include/Game/Camera/CamHeliEffector.hpp index 45fa87206..b91020f3e 100644 --- a/include/Game/Camera/CamHeliEffector.hpp +++ b/include/Game/Camera/CamHeliEffector.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution/types.h" +#include class CameraMan; diff --git a/include/Game/Camera/CamKarikariEffector.hpp b/include/Game/Camera/CamKarikariEffector.hpp index 4d4583975..28ea471ec 100644 --- a/include/Game/Camera/CamKarikariEffector.hpp +++ b/include/Game/Camera/CamKarikariEffector.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution.h" +#include class CameraMan; diff --git a/include/Game/Camera/CameraContext.hpp b/include/Game/Camera/CameraContext.hpp index b81071b5c..febe1399a 100644 --- a/include/Game/Camera/CameraContext.hpp +++ b/include/Game/Camera/CameraContext.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/NameObj/NameObj.hpp" -#include "JSystem/JGeometry.hpp" +#include class CameraContext : public NameObj { public: diff --git a/include/Game/Camera/CameraCover.hpp b/include/Game/Camera/CameraCover.hpp index b27167bd3..86ec50228 100644 --- a/include/Game/Camera/CameraCover.hpp +++ b/include/Game/Camera/CameraCover.hpp @@ -2,7 +2,7 @@ #include "Game/NameObj/NameObj.hpp" #include "Game/Screen/CaptureScreenDirector.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class CameraCover : public NameObj { public: diff --git a/include/Game/Camera/CameraDPD.hpp b/include/Game/Camera/CameraDPD.hpp index d56449419..eff3f0c54 100644 --- a/include/Game/Camera/CameraDPD.hpp +++ b/include/Game/Camera/CameraDPD.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Camera/Camera.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class CameraDPD : public Camera { public: diff --git a/include/Game/Camera/CameraDirector.hpp b/include/Game/Camera/CameraDirector.hpp index aa13851e3..195f6cb42 100644 --- a/include/Game/Camera/CameraDirector.hpp +++ b/include/Game/Camera/CameraDirector.hpp @@ -2,7 +2,7 @@ #include "Game/Camera/CameraHolder.hpp" #include "Game/NameObj/NameObj.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class CameraCover; class CameraDirector; diff --git a/include/Game/Camera/CameraManPause.hpp b/include/Game/Camera/CameraManPause.hpp index a0cd5b3cd..b41744136 100644 --- a/include/Game/Camera/CameraManPause.hpp +++ b/include/Game/Camera/CameraManPause.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Camera/CameraMan.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class CameraManPause : public CameraMan { public: diff --git a/include/Game/Camera/CameraShakePatternImpl.hpp b/include/Game/Camera/CameraShakePatternImpl.hpp index cd3e83df8..2dd6f5ab5 100644 --- a/include/Game/Camera/CameraShakePatternImpl.hpp +++ b/include/Game/Camera/CameraShakePatternImpl.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include class CameraShakePattern { public: diff --git a/include/Game/Camera/CameraTargetHolder.hpp b/include/Game/Camera/CameraTargetHolder.hpp index 88f3c62ef..dd679223d 100644 --- a/include/Game/Camera/CameraTargetHolder.hpp +++ b/include/Game/Camera/CameraTargetHolder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution.h" +#include class CameraTargetActor; class CameraTargetObj; diff --git a/include/Game/Camera/CameraTargetMtx.hpp b/include/Game/Camera/CameraTargetMtx.hpp index 2dc1779c4..40bea1860 100644 --- a/include/Game/Camera/CameraTargetMtx.hpp +++ b/include/Game/Camera/CameraTargetMtx.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Camera/CameraTargetObj.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class CameraTargetMtx : public CameraTargetObj { public: diff --git a/include/Game/Camera/CameraViewInterpolator.hpp b/include/Game/Camera/CameraViewInterpolator.hpp index 5a1ec3357..8e3bd4446 100644 --- a/include/Game/Camera/CameraViewInterpolator.hpp +++ b/include/Game/Camera/CameraViewInterpolator.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include class CameraTargetObj; class Binder; diff --git a/include/Game/Camera/DotCamParams.hpp b/include/Game/Camera/DotCamParams.hpp index cfbb8e7a9..79bd698b8 100644 --- a/include/Game/Camera/DotCamParams.hpp +++ b/include/Game/Camera/DotCamParams.hpp @@ -1,8 +1,8 @@ #pragma once #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution.h" +#include +#include class DotCamReader { public: diff --git a/include/Game/Camera/GameCameraCreator.hpp b/include/Game/Camera/GameCameraCreator.hpp index 809f08951..beb43f923 100644 --- a/include/Game/Camera/GameCameraCreator.hpp +++ b/include/Game/Camera/GameCameraCreator.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution.h" +#include class CameraParamChunkHolder; diff --git a/include/Game/Demo/AstroDomeDemoStarter.hpp b/include/Game/Demo/AstroDomeDemoStarter.hpp index 47a6c3b5b..b8a3eddf5 100644 --- a/include/Game/Demo/AstroDomeDemoStarter.hpp +++ b/include/Game/Demo/AstroDomeDemoStarter.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class ActorCameraInfo; class SpinDriverShootPath; diff --git a/include/Game/Demo/DemoPlayerKeeper.hpp b/include/Game/Demo/DemoPlayerKeeper.hpp index 60cc7c6c8..ae19b8750 100644 --- a/include/Game/Demo/DemoPlayerKeeper.hpp +++ b/include/Game/Demo/DemoPlayerKeeper.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "Game/Demo/DemoExecutor.hpp" class DemoPlayerInfo { public: diff --git a/include/Game/Effect/EffectSystemUtil.hpp b/include/Game/Effect/EffectSystemUtil.hpp index ab121a69b..a48346662 100644 --- a/include/Game/Effect/EffectSystemUtil.hpp +++ b/include/Game/Effect/EffectSystemUtil.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TMatrix.hpp" +#include #include class AutoEffectInfo; diff --git a/include/Game/Enemy/AnimScaleController.hpp b/include/Game/Enemy/AnimScaleController.hpp index c553bcb2d..c3b0fc4ba 100644 --- a/include/Game/Enemy/AnimScaleController.hpp +++ b/include/Game/Enemy/AnimScaleController.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/System/NerveExecutor.hpp" -#include "JSystem/JGeometry.hpp" +#include class AnimScaleParam { public: diff --git a/include/Game/Enemy/FireBall.hpp b/include/Game/Enemy/FireBall.hpp index 69a285b73..d0d59d554 100644 --- a/include/Game/Enemy/FireBall.hpp +++ b/include/Game/Enemy/FireBall.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class FireBall : public LiveActor { public: diff --git a/include/Game/Enemy/HammerHeadPackun.hpp b/include/Game/Enemy/HammerHeadPackun.hpp index e1ff1cb7a..2adc7431e 100644 --- a/include/Game/Enemy/HammerHeadPackun.hpp +++ b/include/Game/Enemy/HammerHeadPackun.hpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class PartsModel; class JointRumbler; diff --git a/include/Game/Enemy/KoteBug.hpp b/include/Game/Enemy/KoteBug.hpp index 0317c8a1b..6312eeaaf 100644 --- a/include/Game/Enemy/KoteBug.hpp +++ b/include/Game/Enemy/KoteBug.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry.hpp" +#include class AnimScaleController; class AnimStampController; diff --git a/include/Game/Enemy/Kuribo.hpp b/include/Game/Enemy/Kuribo.hpp index 882650692..9babcd105 100644 --- a/include/Game/Enemy/Kuribo.hpp +++ b/include/Game/Enemy/Kuribo.hpp @@ -5,7 +5,7 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry/TQuat.hpp" +#include class ItemGenerator; class WalkerStateStagger; diff --git a/include/Game/Gravity/PlanetGravity.hpp b/include/Game/Gravity/PlanetGravity.hpp index f00b00341..f116eb226 100644 --- a/include/Game/Gravity/PlanetGravity.hpp +++ b/include/Game/Gravity/PlanetGravity.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include class NameObj; diff --git a/include/Game/LiveActor/ActorJointCtrl.hpp b/include/Game/LiveActor/ActorJointCtrl.hpp index 64234463c..3ab6030c9 100644 --- a/include/Game/LiveActor/ActorJointCtrl.hpp +++ b/include/Game/LiveActor/ActorJointCtrl.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include #include class DynamicJointCtrlKeeper; diff --git a/include/Game/LiveActor/DynamicJointCtrl.hpp b/include/Game/LiveActor/DynamicJointCtrl.hpp index 917728637..1a1dda10c 100644 --- a/include/Game/LiveActor/DynamicJointCtrl.hpp +++ b/include/Game/LiveActor/DynamicJointCtrl.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include #include class LiveActor; diff --git a/include/Game/LiveActor/FaceJointCtrl.hpp b/include/Game/LiveActor/FaceJointCtrl.hpp index 041332cf3..f846335e6 100644 --- a/include/Game/LiveActor/FaceJointCtrl.hpp +++ b/include/Game/LiveActor/FaceJointCtrl.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include #include class JointController; diff --git a/include/Game/LiveActor/HitSensorInfo.hpp b/include/Game/LiveActor/HitSensorInfo.hpp index 1aa097c89..4827d706c 100644 --- a/include/Game/LiveActor/HitSensorInfo.hpp +++ b/include/Game/LiveActor/HitSensorInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include #include class HitSensor; diff --git a/include/Game/LiveActor/HitSensorKeeper.hpp b/include/Game/LiveActor/HitSensorKeeper.hpp index 5c158871c..590714ef6 100644 --- a/include/Game/LiveActor/HitSensorKeeper.hpp +++ b/include/Game/LiveActor/HitSensorKeeper.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include #include class HitSensor; diff --git a/include/Game/LiveActor/MaterialCtrl.hpp b/include/Game/LiveActor/MaterialCtrl.hpp index 61390be5f..acd04c87b 100644 --- a/include/Game/LiveActor/MaterialCtrl.hpp +++ b/include/Game/LiveActor/MaterialCtrl.hpp @@ -1,10 +1,10 @@ #pragma once #include "Game/Util/StringUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DModelData.hpp" -#include "JSystem/J3DGraphBase/J3DStruct.hpp" -#include "JSystem/J3DGraphBase/J3DTexture.hpp" -#include "JSystem/JUtility/JUTNameTab.hpp" +#include +#include +#include +#include #include class J3DTexMtx; diff --git a/include/Game/LiveActor/ShadowVolumeFlatModel.hpp b/include/Game/LiveActor/ShadowVolumeFlatModel.hpp index 631443cf6..866de444f 100644 --- a/include/Game/LiveActor/ShadowVolumeFlatModel.hpp +++ b/include/Game/LiveActor/ShadowVolumeFlatModel.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/ShadowVolumeModel.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class J3DModelData; diff --git a/include/Game/LiveActor/VolumeModelDrawer.hpp b/include/Game/LiveActor/VolumeModelDrawer.hpp index acb11a24b..a28550a0c 100644 --- a/include/Game/LiveActor/VolumeModelDrawer.hpp +++ b/include/Game/LiveActor/VolumeModelDrawer.hpp @@ -2,7 +2,7 @@ #include "Game/NameObj/NameObj.hpp" #include "Game/Util/Color.hpp" -#include "JSystem/J3DGraphAnimator/J3DModelData.hpp" +#include #include class VolumeModelDrawer : public NameObj { diff --git a/include/Game/Map/CollisionParts.hpp b/include/Game/Map/CollisionParts.hpp index 98392d2ba..1ec1ed1b1 100644 --- a/include/Game/Map/CollisionParts.hpp +++ b/include/Game/Map/CollisionParts.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include #include class CollisionZone; diff --git a/include/Game/Map/HitInfo.hpp b/include/Game/Map/HitInfo.hpp index 7813e19a0..a511a2315 100644 --- a/include/Game/Map/HitInfo.hpp +++ b/include/Game/Map/HitInfo.hpp @@ -1,8 +1,8 @@ #pragma once #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include +#include class CollisionParts; class HitSensor; diff --git a/include/Game/Map/KCollision.hpp b/include/Game/Map/KCollision.hpp index 239739fe3..d2662084d 100644 --- a/include/Game/Map/KCollision.hpp +++ b/include/Game/Map/KCollision.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include #include class JMapInfo; diff --git a/include/Game/Map/LightFunction.hpp b/include/Game/Map/LightFunction.hpp index 95961dd99..2433860bf 100644 --- a/include/Game/Map/LightFunction.hpp +++ b/include/Game/Map/LightFunction.hpp @@ -2,7 +2,7 @@ #include "Game/Map/LightDataHolder.hpp" #include "Game/Map/LightZoneDataHolder.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include #include class JMapInfo; diff --git a/include/Game/Map/LightPointCtrl.hpp b/include/Game/Map/LightPointCtrl.hpp index 76fcad3e9..745984e66 100644 --- a/include/Game/Map/LightPointCtrl.hpp +++ b/include/Game/Map/LightPointCtrl.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Util/Color.hpp" -#include "revolution/gx/GXEnum.h" +#include #include #include diff --git a/include/Game/Map/NamePosHolder.hpp b/include/Game/Map/NamePosHolder.hpp index 9fc99c6f7..8c57a2e1d 100644 --- a/include/Game/Map/NamePosHolder.hpp +++ b/include/Game/Map/NamePosHolder.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/NameObj/NameObj.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class JMapLinkInfo; diff --git a/include/Game/Map/PlanetMap.hpp b/include/Game/Map/PlanetMap.hpp index 211ad964b..e514ec0f5 100644 --- a/include/Game/Map/PlanetMap.hpp +++ b/include/Game/Map/PlanetMap.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class LodCtrl; class ModelObj; diff --git a/include/Game/Map/RailGraph.hpp b/include/Game/Map/RailGraph.hpp index caef40927..a49b2ac51 100644 --- a/include/Game/Map/RailGraph.hpp +++ b/include/Game/Map/RailGraph.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include #include class RailGraphIter; diff --git a/include/Game/Map/RailGraphNode.hpp b/include/Game/Map/RailGraphNode.hpp index 7a372eb64..85c5d806b 100644 --- a/include/Game/Map/RailGraphNode.hpp +++ b/include/Game/Map/RailGraphNode.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include #include class RailGraphNode { diff --git a/include/Game/Map/RailPart.hpp b/include/Game/Map/RailPart.hpp index 0348dd034..c18a9afb1 100644 --- a/include/Game/Map/RailPart.hpp +++ b/include/Game/Map/RailPart.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include class LinearRailPart; class BezierRailPart; diff --git a/include/Game/MapObj/ClipAreaDropLaser.hpp b/include/Game/MapObj/ClipAreaDropLaser.hpp index 132118c17..168a2edd5 100644 --- a/include/Game/MapObj/ClipAreaDropLaser.hpp +++ b/include/Game/MapObj/ClipAreaDropLaser.hpp @@ -3,7 +3,7 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/LiveActor/Nerve.hpp" #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include #include class ClipAreaDropLaser : public LiveActor { diff --git a/include/Game/MapObj/CollectCounter.hpp b/include/Game/MapObj/CollectCounter.hpp index d6f9c1b1a..2afcc3971 100644 --- a/include/Game/MapObj/CollectCounter.hpp +++ b/include/Game/MapObj/CollectCounter.hpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/Screen/LayoutActor.hpp" -#include "JSystem/JGeometry.hpp" +#include class CollectCounter : public LayoutActor { public: diff --git a/include/Game/MapObj/DesertLandMoveSwitch.hpp b/include/Game/MapObj/DesertLandMoveSwitch.hpp index 444a136ca..c9f56dad2 100644 --- a/include/Game/MapObj/DesertLandMoveSwitch.hpp +++ b/include/Game/MapObj/DesertLandMoveSwitch.hpp @@ -7,7 +7,7 @@ #include "Game/MapObj/MapObjConnector.hpp" #include "Game/Util/JMapInfo.hpp" #include "Game/Util/SpringValue.hpp" -#include "revolution/types.h" +#include class DesertLandMoveSwitch : public LiveActor { public: diff --git a/include/Game/MapObj/DriftWood.hpp b/include/Game/MapObj/DriftWood.hpp index 3351e6d0c..ae6071752 100644 --- a/include/Game/MapObj/DriftWood.hpp +++ b/include/Game/MapObj/DriftWood.hpp @@ -2,8 +2,8 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/MapObj/MapObjActor.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include class DriftWood : public MapObjActor { public: diff --git a/include/Game/MapObj/HipDropTimerSwitch.hpp b/include/Game/MapObj/HipDropTimerSwitch.hpp index 875901c45..f091e9e39 100644 --- a/include/Game/MapObj/HipDropTimerSwitch.hpp +++ b/include/Game/MapObj/HipDropTimerSwitch.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class SpringValue; class MapObjConnector; diff --git a/include/Game/MapObj/JumpStand.hpp b/include/Game/MapObj/JumpStand.hpp index 6398d854b..ec6da79bf 100644 --- a/include/Game/MapObj/JumpStand.hpp +++ b/include/Game/MapObj/JumpStand.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class JumpStand : public LiveActor { public: diff --git a/include/Game/MapObj/OceanSmallTurtle.hpp b/include/Game/MapObj/OceanSmallTurtle.hpp index 7c57b8555..0bb981245 100644 --- a/include/Game/MapObj/OceanSmallTurtle.hpp +++ b/include/Game/MapObj/OceanSmallTurtle.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include class MapPartsRailMover; class OceanSmallTurtle : public LiveActor { diff --git a/include/Game/MapObj/PalmIsland.hpp b/include/Game/MapObj/PalmIsland.hpp index c0c740a0d..7bef801c2 100644 --- a/include/Game/MapObj/PalmIsland.hpp +++ b/include/Game/MapObj/PalmIsland.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class PalmIsland : public LiveActor { public: diff --git a/include/Game/MapObj/SpinDriverPathDrawer.hpp b/include/Game/MapObj/SpinDriverPathDrawer.hpp index 17fac4714..cff82ef51 100644 --- a/include/Game/MapObj/SpinDriverPathDrawer.hpp +++ b/include/Game/MapObj/SpinDriverPathDrawer.hpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/MapObj/SpinDriverShootPath.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include class SpinDriverPathDrawInit : public NameObj { public: diff --git a/include/Game/MapObj/StarPiece.hpp b/include/Game/MapObj/StarPiece.hpp index 3d6e25bb1..f7558c289 100644 --- a/include/Game/MapObj/StarPiece.hpp +++ b/include/Game/MapObj/StarPiece.hpp @@ -3,8 +3,8 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/JMapInfo.hpp" #include "Game/Util/TriangleFilter.hpp" -#include "JSystem/J3DGraphBase/J3DStruct.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include +#include class HitSensor; // this function does not belong in this header, but will put here for now diff --git a/include/Game/MapObj/StarPieceFollowGroup.hpp b/include/Game/MapObj/StarPieceFollowGroup.hpp index 51d1c6859..cb02c5307 100644 --- a/include/Game/MapObj/StarPieceFollowGroup.hpp +++ b/include/Game/MapObj/StarPieceFollowGroup.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class StarPiece; diff --git a/include/Game/NPC/Butler.hpp b/include/Game/NPC/Butler.hpp index af3c8d187..466adae3a 100644 --- a/include/Game/NPC/Butler.hpp +++ b/include/Game/NPC/Butler.hpp @@ -5,7 +5,7 @@ #include "Game/NPC/TalkMessageCtrl.hpp" #include "Game/Util/JMapInfo.hpp" #include "Game/Util/NPCUtil.hpp" -#include "revolution/types.h" +#include class Butler : public NPCActor { public: diff --git a/include/Game/NPC/NPCFunction.hpp b/include/Game/NPC/NPCFunction.hpp index 00e25f1a2..1d218bbe1 100644 --- a/include/Game/NPC/NPCFunction.hpp +++ b/include/Game/NPC/NPCFunction.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution/types.h" +#include class NPCActorItem; diff --git a/include/Game/NPC/NPCParameter.hpp b/include/Game/NPC/NPCParameter.hpp index 419011228..ff361fc31 100644 --- a/include/Game/NPC/NPCParameter.hpp +++ b/include/Game/NPC/NPCParameter.hpp @@ -4,7 +4,7 @@ #include "Game/NPC/NPCActorItem.hpp" #include "Game/Util/Array.hpp" #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class JMapInfo; class NPCActorItem; diff --git a/include/Game/NPC/PowerStarEventKeeper.hpp b/include/Game/NPC/PowerStarEventKeeper.hpp index 0bdda954a..bbabd94a3 100644 --- a/include/Game/NPC/PowerStarEventKeeper.hpp +++ b/include/Game/NPC/PowerStarEventKeeper.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include struct PowerStarInfo { bool _0; diff --git a/include/Game/NPC/Rabbit.hpp b/include/Game/NPC/Rabbit.hpp index 5833114a0..bd9709c29 100644 --- a/include/Game/NPC/Rabbit.hpp +++ b/include/Game/NPC/Rabbit.hpp @@ -1,8 +1,8 @@ #pragma once #include "Game/NPC/NPCActor.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include class LodCtrl; class TalkMessageCtrl; diff --git a/include/Game/NPC/Syati.hpp b/include/Game/NPC/Syati.hpp index 0e1212848..abfa9cbdb 100644 --- a/include/Game/NPC/Syati.hpp +++ b/include/Game/NPC/Syati.hpp @@ -7,7 +7,7 @@ #include "Game/Map/RaceManager.hpp" #include "Game/NPC/TalkMessageCtrl.hpp" #include "Game/Util/JointController.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include #include class PlayerPoseSetterInWater; diff --git a/include/Game/Player/FireMarioBall.hpp b/include/Game/Player/FireMarioBall.hpp index 90e847c33..11e956942 100644 --- a/include/Game/Player/FireMarioBall.hpp +++ b/include/Game/Player/FireMarioBall.hpp @@ -3,8 +3,8 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include class FireMarioBall : public LiveActor { public: diff --git a/include/Game/Player/GhostPacket.hpp b/include/Game/Player/GhostPacket.hpp index c306a57b5..9ec664155 100644 --- a/include/Game/Player/GhostPacket.hpp +++ b/include/Game/Player/GhostPacket.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include #include class GhostPacket { diff --git a/include/Game/Player/MarioSlider.hpp b/include/Game/Player/MarioSlider.hpp index 94e83ba97..d9d64c3ea 100644 --- a/include/Game/Player/MarioSlider.hpp +++ b/include/Game/Player/MarioSlider.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Player/MarioState.hpp" -#include "revolution/mtx.h" +#include class MarioActor; diff --git a/include/Game/Player/ModelHolder.hpp b/include/Game/Player/ModelHolder.hpp index 86d9437e5..9e49cc6be 100644 --- a/include/Game/Player/ModelHolder.hpp +++ b/include/Game/Player/ModelHolder.hpp @@ -1,8 +1,8 @@ #pragma once #include "Game/LiveActor/LiveActor.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "revolution/mtx.h" +#include +#include class ModelHolder : public LiveActor { public: diff --git a/include/Game/RhythmLib/AudMeSeqReader.hpp b/include/Game/RhythmLib/AudMeSeqReader.hpp index 7ffb9e347..4b5864dca 100644 --- a/include/Game/RhythmLib/AudMeSeqReader.hpp +++ b/include/Game/RhythmLib/AudMeSeqReader.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JAudio2/JASSeqReader.hpp" +#include class AudMeSeqReader { public: diff --git a/include/Game/RhythmLib/AudMeTrack.hpp b/include/Game/RhythmLib/AudMeTrack.hpp index 9bc93973d..7e8736f3c 100644 --- a/include/Game/RhythmLib/AudMeTrack.hpp +++ b/include/Game/RhythmLib/AudMeTrack.hpp @@ -3,9 +3,9 @@ #include "Game/RhythmLib/AudMeChannelMgr.hpp" #include "Game/RhythmLib/AudMeSeqCtrl.hpp" #include "Game/RhythmLib/AudMeTrackCallback.hpp" -#include "JSystem/JAudio2/JASBankTable.hpp" -#include "JSystem/JAudio2/JASDSPInterface.hpp" -#include "JSystem/JGadget/linklist.hpp" +#include +#include +#include #include #include diff --git a/include/Game/Screen/LayoutGroupCtrl.hpp b/include/Game/Screen/LayoutGroupCtrl.hpp index ccb1b7a2f..904273c61 100644 --- a/include/Game/Screen/LayoutGroupCtrl.hpp +++ b/include/Game/Screen/LayoutGroupCtrl.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Util/Array.hpp" -#include "revolution/types.h" +#include namespace nw4r { namespace lyt { diff --git a/include/Game/System/DrawBufferExecuter.hpp b/include/Game/System/DrawBufferExecuter.hpp index 77abbf2f0..e4c9d0dc1 100644 --- a/include/Game/System/DrawBufferExecuter.hpp +++ b/include/Game/System/DrawBufferExecuter.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution.h" +#include class J3DModel; class LiveActor; diff --git a/include/Game/System/FileLoader.hpp b/include/Game/System/FileLoader.hpp index 16417cf7c..306530165 100644 --- a/include/Game/System/FileLoader.hpp +++ b/include/Game/System/FileLoader.hpp @@ -3,9 +3,9 @@ #include "Game/System/ArchiveHolder.hpp" #include "Game/System/FileHolder.hpp" #include "Game/System/FileLoaderThread.hpp" -#include "JSystem/JKernel/JKRDvdRipper.hpp" -#include "JSystem/JKernel/JKRHeap.hpp" -#include "revolution.h" +#include +#include +#include #include class JKRArchive; diff --git a/include/Game/System/WPadAcceleration.hpp b/include/Game/System/WPadAcceleration.hpp index 3303e82c6..a60dd9bf7 100644 --- a/include/Game/System/WPadAcceleration.hpp +++ b/include/Game/System/WPadAcceleration.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include #include class WPad; diff --git a/include/Game/Util/FurDrawer.hpp b/include/Game/Util/FurDrawer.hpp index 200b1d146..4ffff2a83 100644 --- a/include/Game/Util/FurDrawer.hpp +++ b/include/Game/Util/FurDrawer.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include #include class DynamicFurParam; diff --git a/include/Game/Util/FurShader.hpp b/include/Game/Util/FurShader.hpp index 245f84e58..5a9d0d9e4 100644 --- a/include/Game/Util/FurShader.hpp +++ b/include/Game/Util/FurShader.hpp @@ -1,7 +1,7 @@ #pragma once -#include "JSystem/J3DGraphAnimator/J3DModel.hpp" -#include "revolution/gx/GXEnum.h" +#include +#include #include class J3DModel; diff --git a/include/Game/Util/IKJoint.hpp b/include/Game/Util/IKJoint.hpp index 73e833de0..aa77593dc 100644 --- a/include/Game/Util/IKJoint.hpp +++ b/include/Game/Util/IKJoint.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include class IKJoint { public: diff --git a/include/Game/Util/JMapUtil.hpp b/include/Game/Util/JMapUtil.hpp index 1ff9573e9..9cc4adf0d 100644 --- a/include/Game/Util/JMapUtil.hpp +++ b/include/Game/Util/JMapUtil.hpp @@ -1,7 +1,7 @@ #pragma once #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry.hpp" +#include #include namespace MR { diff --git a/include/Game/Util/JointController.hpp b/include/Game/Util/JointController.hpp index 685e760e6..50d24b003 100644 --- a/include/Game/Util/JointController.hpp +++ b/include/Game/Util/JointController.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include #include class J3DJoint; diff --git a/include/Game/Util/LiveActorUtil.hpp b/include/Game/Util/LiveActorUtil.hpp index d63bf13fb..3b50933f3 100644 --- a/include/Game/Util/LiveActorUtil.hpp +++ b/include/Game/Util/LiveActorUtil.hpp @@ -2,10 +2,10 @@ #include "Game/Animation/AnmPlayer.hpp" #include "Game/Util/JMapInfo.hpp" -#include "JSystem/J3DGraphBase/J3DStruct.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/mtx.h" +#include +#include +#include +#include #include class ActorLightCtrl; diff --git a/include/Game/Util/MathUtil.hpp b/include/Game/Util/MathUtil.hpp index 297be7dde..eb66ea850 100644 --- a/include/Game/Util/MathUtil.hpp +++ b/include/Game/Util/MathUtil.hpp @@ -1,7 +1,7 @@ #pragma once -#include "JSystem/JGeometry/TUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include +#include #include #include #include diff --git a/include/Game/Util/MemoryUtil.hpp b/include/Game/Util/MemoryUtil.hpp index 7d3a5654d..444161b64 100644 --- a/include/Game/Util/MemoryUtil.hpp +++ b/include/Game/Util/MemoryUtil.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JKernel/JKRHeap.hpp" +#include #include class JKRExpHeap; diff --git a/include/Game/Util/ModelUtil.hpp b/include/Game/Util/ModelUtil.hpp index 92a4536d7..eb26745a3 100644 --- a/include/Game/Util/ModelUtil.hpp +++ b/include/Game/Util/ModelUtil.hpp @@ -1,8 +1,8 @@ #pragma once -#include "JSystem/J3DGraphAnimator/J3DModel.hpp" -#include "JSystem/J3DGraphAnimator/J3DModelData.hpp" -#include "JSystem/JGeometry/TBox.hpp" +#include +#include +#include #include class J3DModel; diff --git a/include/Game/Util/MtxUtil.hpp b/include/Game/Util/MtxUtil.hpp index f8211e737..5e7411e72 100644 --- a/include/Game/Util/MtxUtil.hpp +++ b/include/Game/Util/MtxUtil.hpp @@ -1,7 +1,7 @@ #pragma once -#include "JSystem/JGeometry.hpp" -#include "revolution/mtx.h" +#include +#include #include class LiveActor; diff --git a/include/Game/Util/MutexHolder.hpp b/include/Game/Util/MutexHolder.hpp index 7d03289f7..507b10ebe 100644 --- a/include/Game/Util/MutexHolder.hpp +++ b/include/Game/Util/MutexHolder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution.h" +#include class JKRHeap; diff --git a/include/Game/Util/ParabolicPath.hpp b/include/Game/Util/ParabolicPath.hpp index cee87158c..f9407d0d9 100644 --- a/include/Game/Util/ParabolicPath.hpp +++ b/include/Game/Util/ParabolicPath.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include class ParabolicPath { public: diff --git a/include/Game/Util/PostureHolder.hpp b/include/Game/Util/PostureHolder.hpp index 2e995ec55..e36c1f9d6 100644 --- a/include/Game/Util/PostureHolder.hpp +++ b/include/Game/Util/PostureHolder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry/TVec.hpp" +#include class LiveActor; diff --git a/include/Game/Util/RailGraphUtil.hpp b/include/Game/Util/RailGraphUtil.hpp index 521c856b7..fff714822 100644 --- a/include/Game/Util/RailGraphUtil.hpp +++ b/include/Game/Util/RailGraphUtil.hpp @@ -3,7 +3,7 @@ #include "Game/Map/RailGraphIter.hpp" #include "Game/Map/RailGraphNode.hpp" #include "Game/Util/JMapInfo.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include class RailGraphNodeSelecter { public: virtual bool isSatisfy(RailGraphIter& rIter) = 0; diff --git a/include/Game/Util/RailUtil.hpp b/include/Game/Util/RailUtil.hpp index fe7f74d7f..3826b8f89 100644 --- a/include/Game/Util/RailUtil.hpp +++ b/include/Game/Util/RailUtil.hpp @@ -1,7 +1,7 @@ #pragma once -#include "JSystem/JGeometry.hpp" -#include "JSystem/JGeometry/TBox.hpp" +#include +#include #include class LiveActor; diff --git a/include/Game/Util/RumbleCalculator.hpp b/include/Game/Util/RumbleCalculator.hpp index e6d30998f..821fbf832 100644 --- a/include/Game/Util/RumbleCalculator.hpp +++ b/include/Game/Util/RumbleCalculator.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include #include class RumbleCalculator { diff --git a/include/Game/Util/StarPointerUtil.hpp b/include/Game/Util/StarPointerUtil.hpp index 3fb7f1eea..6bcb746a0 100644 --- a/include/Game/Util/StarPointerUtil.hpp +++ b/include/Game/Util/StarPointerUtil.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JSystem/JGeometry.hpp" +#include #include class LayoutActor; diff --git a/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.hpp b/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.hpp index f9ea51c8d..b0442a972 100644 --- a/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.hpp +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.hpp @@ -1,7 +1,7 @@ #pragma once #include "JSystem/JGeometry/TBox.hpp" -#include +#include "JSystem/J2DGraph/J2DGrafContext.hpp" class J2DOrthoGraph : public J2DGrafContext { public: diff --git a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.hpp b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.hpp index a47debf5a..2c6ea7df9 100644 --- a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.hpp @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphBase/J3DTransform.hpp" #include "JSystem/JUtility/JUTNameTab.hpp" -#include "revolution.h" +#include struct JUTDataBlockHeader { /* 0x0 */ u32 mType; diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.hpp index 19f1da016..339e17c47 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "JSystem/JGeometry/TMatrix.hpp" +#include "JSystem/JGeometry/TVec.hpp" #include struct J3DGXColor : public GXColor { diff --git a/libs/JSystem/include/JSystem/JAudio2/JAIAudible.hpp b/libs/JSystem/include/JSystem/JAudio2/JAIAudible.hpp index c6ed6c673..cf72909e1 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JAIAudible.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JAIAudible.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "JSystem/JGeometry/TVec.hpp" struct JASSoundParams; diff --git a/libs/JSystem/include/JSystem/JAudio2/JASBNKParser.hpp b/libs/JSystem/include/JSystem/JAudio2/JASBNKParser.hpp index ba35f0ef9..824fdfe88 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASBNKParser.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASBNKParser.hpp @@ -3,7 +3,7 @@ #include "JSystem/JAudio2/JASBasicInst.hpp" #include "JSystem/JAudio2/JASOscillator.hpp" #include "JSystem/JSupport/JSupport.hpp" -#include "revolution/types.h" +#include class JASBank; class JASBasicBank; diff --git a/libs/JSystem/include/JSystem/JAudio2/JASBank.hpp b/libs/JSystem/include/JSystem/JAudio2/JASBank.hpp index fad607438..945145c90 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASBank.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASBank.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "JSystem/JAudio2/JASGadget.hpp" #include namespace JASDsp { diff --git a/libs/JSystem/include/JSystem/JAudio2/JASBankTable.hpp b/libs/JSystem/include/JSystem/JAudio2/JASBankTable.hpp index a2ffe5b9c..278b848ee 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASBankTable.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASBankTable.hpp @@ -1,9 +1,9 @@ #pragma once #include "JSystem/JAudio2/JASGadget.hpp" -#include +#include "JSystem/JAudio2/JASGlobal.hpp" -#include +#include "JSystem/JAudio2/JASBankList.hpp" #include diff --git a/libs/JSystem/include/JSystem/JAudio2/JASDSPChannel.hpp b/libs/JSystem/include/JSystem/JAudio2/JASDSPChannel.hpp index 548ca9a76..49952124f 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASDSPChannel.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASDSPChannel.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "JSystem/JAudio2/JASDSPInterface.hpp" struct JASDSPChannel { typedef s32 (*Callback)(u32, JASDsp::TChannel*, void*); diff --git a/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.hpp b/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.hpp index 42171a22a..fc072e30b 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "JSystem/JAudio2/JASCallback.hpp" typedef s32 (*DriverCallback)(void*); diff --git a/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.hpp b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.hpp index d25bbb479..4e245ba7a 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.hpp @@ -3,7 +3,7 @@ #include "JSystem/JAudio2/JASCriticalSection.hpp" #include "JSystem/JKernel/JKRHeap.hpp" #include "JSystem/JSupport/JSUList.hpp" -#include "revolution/os/OSInterrupt.h" +#include #include #include diff --git a/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.hpp b/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.hpp index 0ad0ea2bc..8766086ed 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution/types.h" +#include #include "JSystem/JAudio2/JASSeqParser.hpp" #include "JSystem/JAudio2/JASSeqReader.hpp" diff --git a/libs/JSystem/include/JSystem/JAudio2/JAUDoppler.hpp b/libs/JSystem/include/JSystem/JAudio2/JAUDoppler.hpp index bdcea73e8..ab603da04 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JAUDoppler.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JAUDoppler.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "JSystem/JAudio2/JASSoundParams.hpp" +#include "JSystem/JAudio2/JAUAudible.hpp" +#include "JSystem/JGeometry/TVec.hpp" class JAUDopplerAudibleAbsPos { public: diff --git a/libs/JSystem/include/JSystem/JAudio2/JAUStreamDataMgr.hpp b/libs/JSystem/include/JSystem/JAudio2/JAUStreamDataMgr.hpp index bc6e5b0a9..fb6f90c93 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JAUStreamDataMgr.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JAUStreamDataMgr.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "JSystem/JAudio2/JAIStreamDataMgr.hpp" +#include "JSystem/JAudio2/JASAramStream.hpp" +#include "JSystem/JAudio2/JASHeapCtrl.hpp" +#include "JSystem/JAudio2/JAUStreamFileTable.hpp" #include template < int N > diff --git a/libs/JSystem/include/JSystem/JGeometry/TMatrix.hpp b/libs/JSystem/include/JSystem/JGeometry/TMatrix.hpp index f2607b00e..19ff2ecb2 100644 --- a/libs/JSystem/include/JSystem/JGeometry/TMatrix.hpp +++ b/libs/JSystem/include/JSystem/JGeometry/TMatrix.hpp @@ -4,8 +4,8 @@ #include "JSystem/JGeometry/TUtil.hpp" #include "JSystem/JGeometry/TVec.hpp" #include "JSystem/JMath/JMath.hpp" -#include "revolution/mtx.h" -#include +#include +#include "JSystem/JMath/JMATrigonometric.hpp" #include namespace JGeometry { diff --git a/libs/JSystem/include/JSystem/JGeometry/TVec.hpp b/libs/JSystem/include/JSystem/JGeometry/TVec.hpp index 5a67b8e84..d97040b7a 100644 --- a/libs/JSystem/include/JSystem/JGeometry/TVec.hpp +++ b/libs/JSystem/include/JSystem/JGeometry/TVec.hpp @@ -5,10 +5,10 @@ // #include "math_types.hpp" #include "JSystem/JGeometry/TUtil.hpp" #include "JSystem/JMath/JMATrigonometric.hpp" -#include "math_types.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" -#include +#include +#include +#include +#include "JSystem/JMath/JMath.hpp" namespace JGeometry { #ifdef __MWERKS__ diff --git a/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.hpp b/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.hpp index e3158567c..df6f9114f 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.hpp @@ -1,7 +1,7 @@ #pragma once #include "JSystem/JKernel/JKRArchive.hpp" -#include "revolution/types.h" +#include class JKRDvdFile; diff --git a/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.hpp b/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.hpp index 74b454fc1..771b37639 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution.h" +#include class JKRArchive; diff --git a/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.hpp b/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.hpp index d9a46a968..aa51df07d 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.hpp @@ -1,7 +1,7 @@ #pragma once #include "JSystem/JKernel/JKRDisposer.hpp" -#include "revolution/os/OSMutex.h" +#include class JKRArcFinder; diff --git a/libs/JSystem/include/JSystem/JParticle/JPAParticleCallBack.hpp b/libs/JSystem/include/JSystem/JParticle/JPAParticleCallBack.hpp index abdeb3687..dcafba7f3 100644 --- a/libs/JSystem/include/JSystem/JParticle/JPAParticleCallBack.hpp +++ b/libs/JSystem/include/JSystem/JParticle/JPAParticleCallBack.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "JSystem/JParticle/JPAEmitterCallBack.hpp" class JPABaseParticle; diff --git a/libs/JSystem/include/JSystem/JSupport/JSupport.hpp b/libs/JSystem/include/JSystem/JSupport/JSupport.hpp index 1f016275f..bead580cf 100644 --- a/libs/JSystem/include/JSystem/JSupport/JSupport.hpp +++ b/libs/JSystem/include/JSystem/JSupport/JSupport.hpp @@ -1,6 +1,6 @@ #pragma once -#include "revolution/types.h" +#include #include template < typename T > diff --git a/libs/MSL_C/include/console_io.h b/libs/MSL_C/include/console_io.h index 4d50867c2..9207a32d2 100644 --- a/libs/MSL_C/include/console_io.h +++ b/libs/MSL_C/include/console_io.h @@ -2,7 +2,7 @@ #define CONSOLE_IO_H #include "ansi_params.h" -#include +#include "cstdio" int __read_console(__std(unsigned long), unsigned char *, __std(size_t) *, __std(void *)); int __write_console(__std(unsigned long), unsigned char *, __std(size_t) *, __std(void *)); diff --git a/libs/MSL_C/include/stddef.h b/libs/MSL_C/include/stddef.h index 62becaef9..63e394ba2 100644 --- a/libs/MSL_C/include/stddef.h +++ b/libs/MSL_C/include/stddef.h @@ -3,8 +3,8 @@ // IWYU pragma: begin_exports -#include <__internal/__NULL.h> -#include <__internal/__size_t.h> +#include "__internal/__NULL.h" +#include "__internal/__size_t.h" #define offsetof(type, member_designator) ((size_t) & (((type*)0)->member_designator)) diff --git a/libs/MSL_C/include/wctype.h b/libs/MSL_C/include/wctype.h index fc4d5e587..17b20c324 100644 --- a/libs/MSL_C/include/wctype.h +++ b/libs/MSL_C/include/wctype.h @@ -1,7 +1,7 @@ #ifndef WCTYPE_H #define WCTYPE_H -#include +#include "wchar_t.h" extern const unsigned short __wctype_mapC[0x100]; extern const wchar_t __wlower_mapC[0x100]; diff --git a/libs/MetroTRK/include/MetroTRK/Portable/dispatch.h b/libs/MetroTRK/include/MetroTRK/Portable/dispatch.h index f536bb0f4..b092b683f 100644 --- a/libs/MetroTRK/include/MetroTRK/Portable/dispatch.h +++ b/libs/MetroTRK/include/MetroTRK/Portable/dispatch.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_DISPATCH_H #define METROTRK_PORTABLE_DISPATCH_H -#include "revolution/types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/libs/MetroTRK/include/MetroTRK/Portable/mem_TRK.h b/libs/MetroTRK/include/MetroTRK/Portable/mem_TRK.h index 51121c10a..b4a5facb9 100644 --- a/libs/MetroTRK/include/MetroTRK/Portable/mem_TRK.h +++ b/libs/MetroTRK/include/MetroTRK/Portable/mem_TRK.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_MEM_TRK_H #define METROTRK_PORTABLE_MEM_TRK_H -#include "revolution/types.h" +#include #include void* TRK_memset(void* dest, int val, size_t count); diff --git a/libs/MetroTRK/include/MetroTRK/Portable/msg.h b/libs/MetroTRK/include/MetroTRK/Portable/msg.h index 58a73e03a..27933bef0 100644 --- a/libs/MetroTRK/include/MetroTRK/Portable/msg.h +++ b/libs/MetroTRK/include/MetroTRK/Portable/msg.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_MSG_H #define METROTRK_PORTABLE_MSG_H -#include "revolution/types.h" +#include typedef struct _TRK_Msg { u8 _00[8]; diff --git a/libs/MetroTRK/include/MetroTRK/Portable/mutex_TRK.h b/libs/MetroTRK/include/MetroTRK/Portable/mutex_TRK.h index d491ced08..fe34214e6 100644 --- a/libs/MetroTRK/include/MetroTRK/Portable/mutex_TRK.h +++ b/libs/MetroTRK/include/MetroTRK/Portable/mutex_TRK.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_MUTEX_TRK_H #define METROTRK_PORTABLE_MUTEX_TRK_H -#include "revolution/types.h" +#include u8 TRKReleaseMutex(); u8 TRKAcquireMutex(); diff --git a/libs/MetroTRK/include/Os/dolphin/UDP_Stubs.h b/libs/MetroTRK/include/Os/dolphin/UDP_Stubs.h index 0627a9bde..c17bf69a0 100644 --- a/libs/MetroTRK/include/Os/dolphin/UDP_Stubs.h +++ b/libs/MetroTRK/include/Os/dolphin/UDP_Stubs.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_UDP_STUBS_H #define OS_DOLPHIN_UDP_STUBS_H -#include "revolution/os.h" +#include #ifdef __cplusplus extern "C" { diff --git a/libs/MetroTRK/include/Os/dolphin/dolphin_trk_glue.h b/libs/MetroTRK/include/Os/dolphin/dolphin_trk_glue.h index 8d79fe40a..035cdc142 100644 --- a/libs/MetroTRK/include/Os/dolphin/dolphin_trk_glue.h +++ b/libs/MetroTRK/include/Os/dolphin/dolphin_trk_glue.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_DOLPHIN_TRK_GLUE_H #define OS_DOLPHIN_DOLPHIN_TRK_GLUE_H -#include "revolution/os.h" +#include #include "trk.h" #ifdef __cplusplus diff --git a/libs/MetroTRK/include/Os/dolphin/target_options.h b/libs/MetroTRK/include/Os/dolphin/target_options.h index 173f0a859..b82c85ed8 100644 --- a/libs/MetroTRK/include/Os/dolphin/target_options.h +++ b/libs/MetroTRK/include/Os/dolphin/target_options.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_TARGET_OPTIONS_H #define OS_DOLPHIN_TARGET_OPTIONS_H -#include "revolution/types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/libs/MetroTRK/include/Os/dolphin/usr_put.h b/libs/MetroTRK/include/Os/dolphin/usr_put.h index 5d536b8f9..dc80d653c 100644 --- a/libs/MetroTRK/include/Os/dolphin/usr_put.h +++ b/libs/MetroTRK/include/Os/dolphin/usr_put.h @@ -1,6 +1,6 @@ #ifndef OS_DOLPHIN_USR_PUT_H #define OS_DOLPHIN_USR_PUT_H -#include "revolution/types.h" +#include #endif /* OS_DOLPHIN_USR_PUT_H */ diff --git a/libs/MetroTRK/include/ppc/Export/targsupp.h b/libs/MetroTRK/include/ppc/Export/targsupp.h index 3e7e56c34..d6a20bec4 100644 --- a/libs/MetroTRK/include/ppc/Export/targsupp.h +++ b/libs/MetroTRK/include/ppc/Export/targsupp.h @@ -1,7 +1,7 @@ #ifndef PPC_EXPORT_TARGSUPP_H #define PPC_EXPORT_TARGSUPP_H -#include "revolution/types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/libs/MetroTRK/include/trk.h b/libs/MetroTRK/include/trk.h index e58ac42e9..1bd1e8e45 100644 --- a/libs/MetroTRK/include/trk.h +++ b/libs/MetroTRK/include/trk.h @@ -1,7 +1,7 @@ #ifndef __METROTRK_TRK_H__ #define __METROTRK_TRK_H__ -#include "revolution/types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/libs/MetroTRK/include/utils/common/CircleBuffer.h b/libs/MetroTRK/include/utils/common/CircleBuffer.h index 3f4e0e122..e8c15f994 100644 --- a/libs/MetroTRK/include/utils/common/CircleBuffer.h +++ b/libs/MetroTRK/include/utils/common/CircleBuffer.h @@ -1,7 +1,7 @@ #ifndef UTILS_COMMON_CIRCLEBUFFER_H #define UTILS_COMMON_CIRCLEBUFFER_H -#include "revolution/types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/libs/MetroTRK/include/utils/common/MWTrace.h b/libs/MetroTRK/include/utils/common/MWTrace.h index fdc80b4a3..d9fda1497 100644 --- a/libs/MetroTRK/include/utils/common/MWTrace.h +++ b/libs/MetroTRK/include/utils/common/MWTrace.h @@ -1,7 +1,7 @@ #ifndef UTILS_COMMON_MWTRACE_H #define UTILS_COMMON_MWTRACE_H -#include "revolution/types.h" +#include void MWTRACE(u8, char*, ...); diff --git a/libs/MetroTRK/include/utils/gc/MWCriticalSection_gc.h b/libs/MetroTRK/include/utils/gc/MWCriticalSection_gc.h index da85ace79..d2686f682 100644 --- a/libs/MetroTRK/include/utils/gc/MWCriticalSection_gc.h +++ b/libs/MetroTRK/include/utils/gc/MWCriticalSection_gc.h @@ -1,7 +1,7 @@ #ifndef UTILS_GC_MWCRITICALSECTION_GC_H #define UTILS_GC_MWCRITICALSECTION_GC_H -#include "revolution/types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFL_Controller.h b/libs/RVLFaceLib/include/RFL_Controller.h index 691217428..1bf66dd0a 100644 --- a/libs/RVLFaceLib/include/RFL_Controller.h +++ b/libs/RVLFaceLib/include/RFL_Controller.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_CONTROLLER_H #define RVL_FACE_LIBRARY_CONTROLLER_H -#include +#include "RFL_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFL_DataUtility.h b/libs/RVLFaceLib/include/RFL_DataUtility.h index 149bfa1c9..234b13805 100644 --- a/libs/RVLFaceLib/include/RFL_DataUtility.h +++ b/libs/RVLFaceLib/include/RFL_DataUtility.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_DATA_UTILITY_H #define RVL_FACE_LIBRARY_DATA_UTILITY_H -#include +#include "RFL_Types.h" #include #include #include diff --git a/libs/RVLFaceLib/include/RFL_Database.h b/libs/RVLFaceLib/include/RFL_Database.h index 18a0fefad..6eec89e05 100644 --- a/libs/RVLFaceLib/include/RFL_Database.h +++ b/libs/RVLFaceLib/include/RFL_Database.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_DATABASE_H #define RVL_FACE_LIBRARY_DATABASE_H -#include +#include "RFL_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFL_Icon.h b/libs/RVLFaceLib/include/RFL_Icon.h index dd3aac387..8ff5bff70 100644 --- a/libs/RVLFaceLib/include/RFL_Icon.h +++ b/libs/RVLFaceLib/include/RFL_Icon.h @@ -1,9 +1,9 @@ #ifndef RVL_FACE_LIBRARY_ICON_H #define RVL_FACE_LIBRARY_ICON_H -#include -#include -#include -#include +#include "RFL_Types.h" +#include "RFLi_Types.h" +#include "RFL_Database.h" +#include "RFL_MiddleDatabase.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFL_MiddleDatabase.h b/libs/RVLFaceLib/include/RFL_MiddleDatabase.h index 5a348ac8b..66385da22 100644 --- a/libs/RVLFaceLib/include/RFL_MiddleDatabase.h +++ b/libs/RVLFaceLib/include/RFL_MiddleDatabase.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_MIDDLE_DATABASE_H #define RVL_FACE_LIBRARY_MIDDLE_DATABASE_H -#include +#include "RFL_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFL_Model.h b/libs/RVLFaceLib/include/RFL_Model.h index 7607654bc..c20d480e4 100644 --- a/libs/RVLFaceLib/include/RFL_Model.h +++ b/libs/RVLFaceLib/include/RFL_Model.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_MODEL_H #define RVL_FACE_LIBRARY_MODEL_H -#include +#include "RFL_Types.h" #include #include #include diff --git a/libs/RVLFaceLib/include/RFL_NANDLoader.h b/libs/RVLFaceLib/include/RFL_NANDLoader.h index 7b79c21e7..a00bc0651 100644 --- a/libs/RVLFaceLib/include/RFL_NANDLoader.h +++ b/libs/RVLFaceLib/include/RFL_NANDLoader.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_NAND_LOADER_H #define RVL_FACE_LIBRARY_NAND_LOADER_H -#include +#include "RFL_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFL_NWC24.h b/libs/RVLFaceLib/include/RFL_NWC24.h index 50633eec0..0eaeb9199 100644 --- a/libs/RVLFaceLib/include/RFL_NWC24.h +++ b/libs/RVLFaceLib/include/RFL_NWC24.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_NWC24_H #define RVL_FACE_LIBRARY_NWC24_H -#include +#include "RFL_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFL_System.h b/libs/RVLFaceLib/include/RFL_System.h index 2416acb65..dd1f7e94e 100644 --- a/libs/RVLFaceLib/include/RFL_System.h +++ b/libs/RVLFaceLib/include/RFL_System.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_SYSTEM_H #define RVL_FACE_LIBRARY_SYSTEM_H -#include +#include "RFL_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFLi_Config.h b/libs/RVLFaceLib/include/RFLi_Config.h index d8bb2ef78..36b61c209 100644 --- a/libs/RVLFaceLib/include/RFLi_Config.h +++ b/libs/RVLFaceLib/include/RFLi_Config.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_INTENRAL_CONFIG_H #define RVL_FACE_LIBRARY_INTERNAL_CONFIG_H -#include +#include "RFLi_Types.h" #include #include #ifdef __cplusplus diff --git a/libs/RVLFaceLib/include/RFLi_Controller.h b/libs/RVLFaceLib/include/RFLi_Controller.h index 3953dd871..b2e667732 100644 --- a/libs/RVLFaceLib/include/RFLi_Controller.h +++ b/libs/RVLFaceLib/include/RFLi_Controller.h @@ -1,7 +1,7 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_CONTROLLER_H #define RVL_FACE_LIBRARY_INTERNAL_CONTROLLER_H -#include -#include +#include "RFL_MiddleDatabase.h" +#include "RFLi_Types.h" #include #include #include diff --git a/libs/RVLFaceLib/include/RFLi_DataUtility.h b/libs/RVLFaceLib/include/RFLi_DataUtility.h index 364f7d1ac..ee13f9a1d 100644 --- a/libs/RVLFaceLib/include/RFLi_DataUtility.h +++ b/libs/RVLFaceLib/include/RFLi_DataUtility.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_INTENRAL_DATA_UTILITY_H #define RVL_FACE_LIBRARY_INTERNAL_DATA_UTILITY_H -#include +#include "RFLi_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFLi_Database.h b/libs/RVLFaceLib/include/RFLi_Database.h index f43bb4f6c..829756d39 100644 --- a/libs/RVLFaceLib/include/RFLi_Database.h +++ b/libs/RVLFaceLib/include/RFLi_Database.h @@ -1,7 +1,7 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_DATABASE_H #define RVL_FACE_LIBRARY_INTERNAL_DATABASE_H -#include -#include +#include "RFLi_HiddenDatabase.h" +#include "RFLi_Types.h" #include #include #include diff --git a/libs/RVLFaceLib/include/RFLi_DefaultDatabase.h b/libs/RVLFaceLib/include/RFLi_DefaultDatabase.h index 98ca5913b..28a0b3b54 100644 --- a/libs/RVLFaceLib/include/RFLi_DefaultDatabase.h +++ b/libs/RVLFaceLib/include/RFLi_DefaultDatabase.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_DEFAULT_DATABASE_H #define RVL_FACE_LIBRARY_INTERNAL_DEFAULT_DATABASE_H -#include +#include "RFLi_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFLi_Format.h b/libs/RVLFaceLib/include/RFLi_Format.h index 77f88e60e..70b33b4a8 100644 --- a/libs/RVLFaceLib/include/RFLi_Format.h +++ b/libs/RVLFaceLib/include/RFLi_Format.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_FORMAT_H #define RVL_FACE_LIBRARY_INTERNAL_FORMAT_H -#include +#include "RFLi_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFLi_HiddenDatabase.h b/libs/RVLFaceLib/include/RFLi_HiddenDatabase.h index 28ed19f1e..adc4498d9 100644 --- a/libs/RVLFaceLib/include/RFLi_HiddenDatabase.h +++ b/libs/RVLFaceLib/include/RFLi_HiddenDatabase.h @@ -1,7 +1,7 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_HIDDEN_DATABASE_H #define RVL_FACE_LIBRARY_INTERNAL_HIDDEN_DATABASE_H -#include -#include +#include "RFLi_Format.h" +#include "RFLi_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFLi_MakeRandomFace.h b/libs/RVLFaceLib/include/RFLi_MakeRandomFace.h index 501041cac..6b9ab1bb9 100644 --- a/libs/RVLFaceLib/include/RFLi_MakeRandomFace.h +++ b/libs/RVLFaceLib/include/RFLi_MakeRandomFace.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_MAKE_RANDOM_FACE_H #define RVL_FACE_LIBRARY_INTERNAL_MAKE_RANDOM_FACE_H -#include +#include "RFLi_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFLi_MakeTex.h b/libs/RVLFaceLib/include/RFLi_MakeTex.h index f3fbc6fda..25b42e403 100644 --- a/libs/RVLFaceLib/include/RFLi_MakeTex.h +++ b/libs/RVLFaceLib/include/RFLi_MakeTex.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_MAKE_TEX_H #define RVL_FACE_LIBRARY_INTERNAL_MAKE_TEX_H -#include +#include "RFLi_Types.h" #include #include #ifdef __cplusplus diff --git a/libs/RVLFaceLib/include/RFLi_MiddleDatabase.h b/libs/RVLFaceLib/include/RFLi_MiddleDatabase.h index ed0e770d0..ddb267ae4 100644 --- a/libs/RVLFaceLib/include/RFLi_MiddleDatabase.h +++ b/libs/RVLFaceLib/include/RFLi_MiddleDatabase.h @@ -1,7 +1,7 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_MIDDLE_DATABASE_H #define RVL_FACE_LIBRARY_INTERNAL_MIDDLE_DATABASE_H -#include -#include +#include "RFL_MiddleDatabase.h" +#include "RFLi_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFLi_Model.h b/libs/RVLFaceLib/include/RFLi_Model.h index 88577dd86..7ed50ba9b 100644 --- a/libs/RVLFaceLib/include/RFLi_Model.h +++ b/libs/RVLFaceLib/include/RFLi_Model.h @@ -1,7 +1,7 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_MODEL_H #define RVL_FACE_LIBRARY_INTERNAL_MODEL_H -#include -#include +#include "RFL_Model.h" +#include "RFLi_Types.h" #include #include #include diff --git a/libs/RVLFaceLib/include/RFLi_NANDAccess.h b/libs/RVLFaceLib/include/RFLi_NANDAccess.h index 97594b8ed..48554e95b 100644 --- a/libs/RVLFaceLib/include/RFLi_NANDAccess.h +++ b/libs/RVLFaceLib/include/RFLi_NANDAccess.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_NAND_ACCESS_H #define RVL_FACE_LIBRARY_INTERNAL_NAND_ACCESS_H -#include +#include "RFLi_Types.h" #include #include #include diff --git a/libs/RVLFaceLib/include/RFLi_NANDLoader.h b/libs/RVLFaceLib/include/RFLi_NANDLoader.h index 956f821d1..4e876183f 100644 --- a/libs/RVLFaceLib/include/RFLi_NANDLoader.h +++ b/libs/RVLFaceLib/include/RFLi_NANDLoader.h @@ -1,7 +1,7 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_NAND_LOADER_H #define RVL_FACE_LIBRARY_INTERNAL_NAND_LOADER_H -#include -#include +#include "RFL_NANDLoader.h" +#include "RFLi_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFLi_System.h b/libs/RVLFaceLib/include/RFLi_System.h index 7ac29fe64..33e0594bd 100644 --- a/libs/RVLFaceLib/include/RFLi_System.h +++ b/libs/RVLFaceLib/include/RFLi_System.h @@ -1,12 +1,12 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_SYSTEM_H #define RVL_FACE_LIBRARY_INTERNAL_SYSTEM_H -#include -#include -#include -#include -#include -#include -#include +#include "RFL_System.h" +#include "RFLi_Controller.h" +#include "RFLi_Database.h" +#include "RFLi_HiddenDatabase.h" +#include "RFLi_NANDAccess.h" +#include "RFLi_NANDLoader.h" +#include "RFLi_Types.h" #include #include #ifdef __cplusplus diff --git a/libs/RVLFaceLib/include/RFLi_Texture.h b/libs/RVLFaceLib/include/RFLi_Texture.h index 3ae656d33..db6d9ffb3 100644 --- a/libs/RVLFaceLib/include/RFLi_Texture.h +++ b/libs/RVLFaceLib/include/RFLi_Texture.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_TEXTURE_H #define RVL_FACE_LIBRARY_INTERNAL_TEXTURE_H -#include +#include "RFLi_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RFLi_Types.h b/libs/RVLFaceLib/include/RFLi_Types.h index e62bf6b9f..21fc2c0e6 100644 --- a/libs/RVLFaceLib/include/RFLi_Types.h +++ b/libs/RVLFaceLib/include/RFLi_Types.h @@ -1,6 +1,6 @@ #ifndef RVL_FACE_LIBRARY_INTERNAL_TYPES_H #define RVL_FACE_LIBRARY_INTERNAL_TYPES_H -#include +#include "RFL_Types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVLFaceLib/include/RVLFaceLib.h b/libs/RVLFaceLib/include/RVLFaceLib.h index 6d7dc9708..b45018746 100644 --- a/libs/RVLFaceLib/include/RVLFaceLib.h +++ b/libs/RVLFaceLib/include/RVLFaceLib.h @@ -4,16 +4,16 @@ extern "C" { #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "RFL_Controller.h" +#include "RFL_DataUtility.h" +#include "RFL_Database.h" +#include "RFL_Icon.h" +#include "RFL_MiddleDatabase.h" +#include "RFL_Model.h" +#include "RFL_NANDLoader.h" +#include "RFL_NWC24.h" +#include "RFL_System.h" +#include "RFL_Types.h" #ifdef __cplusplus } diff --git a/libs/RVLFaceLib/include/RVLFaceLibInternal.h b/libs/RVLFaceLib/include/RVLFaceLibInternal.h index c71bebdf2..96ad4155c 100644 --- a/libs/RVLFaceLib/include/RVLFaceLibInternal.h +++ b/libs/RVLFaceLib/include/RVLFaceLibInternal.h @@ -4,23 +4,23 @@ extern "C" { #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "RVLFaceLib.h" +#include "RFLi_Config.h" +#include "RFLi_Controller.h" +#include "RFLi_DataUtility.h" +#include "RFLi_Database.h" +#include "RFLi_DefaultDatabase.h" +#include "RFLi_Format.h" +#include "RFLi_HiddenDatabase.h" +#include "RFLi_MakeRandomFace.h" +#include "RFLi_MakeTex.h" +#include "RFLi_MiddleDatabase.h" +#include "RFLi_Model.h" +#include "RFLi_NANDAccess.h" +#include "RFLi_NANDLoader.h" +#include "RFLi_System.h" +#include "RFLi_Texture.h" +#include "RFLi_Types.h" #ifdef __cplusplus } diff --git a/libs/RVL_SDK/include/private/flipper.h b/libs/RVL_SDK/include/private/flipper.h index de24ee5fe..5881b6425 100644 --- a/libs/RVL_SDK/include/private/flipper.h +++ b/libs/RVL_SDK/include/private/flipper.h @@ -1,7 +1,7 @@ #ifndef FLIPPER_H #define FLIPPER_H -#include +#include "revolution/types.h" #ifdef __MWERKS__ vu16 __VIRegs[0x3B] : 0xCC002000; diff --git a/libs/RVL_SDK/include/revolution/ai.h b/libs/RVL_SDK/include/revolution/ai.h index d5368df8c..6a8a825cd 100644 --- a/libs/RVL_SDK/include/revolution/ai.h +++ b/libs/RVL_SDK/include/revolution/ai.h @@ -1,7 +1,7 @@ #ifndef AI_H #define AI_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/aralt.h b/libs/RVL_SDK/include/revolution/aralt.h index c61e336f8..95bc92956 100644 --- a/libs/RVL_SDK/include/revolution/aralt.h +++ b/libs/RVL_SDK/include/revolution/aralt.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/types.h" typedef void (*ARCallback)(void); typedef void (*ARQCallback)(u32); diff --git a/libs/RVL_SDK/include/revolution/axfx.h b/libs/RVL_SDK/include/revolution/axfx.h index 1b447b87d..6f5ccb861 100644 --- a/libs/RVL_SDK/include/revolution/axfx.h +++ b/libs/RVL_SDK/include/revolution/axfx.h @@ -2,7 +2,7 @@ #define AXFX_H #include -#include +#include "revolution.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/base/PPCArch.h b/libs/RVL_SDK/include/revolution/base/PPCArch.h index 4fcf1e12d..45de3b313 100644 --- a/libs/RVL_SDK/include/revolution/base/PPCArch.h +++ b/libs/RVL_SDK/include/revolution/base/PPCArch.h @@ -1,7 +1,7 @@ #ifndef PPCARCH_H #define PPCARCH_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/base/PPCWGPipe.h b/libs/RVL_SDK/include/revolution/base/PPCWGPipe.h index e5a48403e..8ea6ffc75 100644 --- a/libs/RVL_SDK/include/revolution/base/PPCWGPipe.h +++ b/libs/RVL_SDK/include/revolution/base/PPCWGPipe.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/types.h" typedef union uPPCWGPipe { u8 u8; diff --git a/libs/RVL_SDK/include/revolution/card.h b/libs/RVL_SDK/include/revolution/card.h index bed5e6fb8..3e5a16b6f 100644 --- a/libs/RVL_SDK/include/revolution/card.h +++ b/libs/RVL_SDK/include/revolution/card.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution.h" typedef struct CARDFileInfo { s32 chan; // at 0x0 diff --git a/libs/RVL_SDK/include/revolution/db.h b/libs/RVL_SDK/include/revolution/db.h index a849547cd..d12622c07 100644 --- a/libs/RVL_SDK/include/revolution/db.h +++ b/libs/RVL_SDK/include/revolution/db.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/types.h" +#include "revolution/os.h" typedef struct DBInterface { u32 _0; diff --git a/libs/RVL_SDK/include/revolution/dsp.h b/libs/RVL_SDK/include/revolution/dsp.h index 22222e2c2..e873b454e 100644 --- a/libs/RVL_SDK/include/revolution/dsp.h +++ b/libs/RVL_SDK/include/revolution/dsp.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/os.h" +#include "revolution/types.h" typedef void (*DSPCallback)(void*); diff --git a/libs/RVL_SDK/include/revolution/dsp/dsp_task.h b/libs/RVL_SDK/include/revolution/dsp/dsp_task.h index fca5a829f..7881c9ee7 100644 --- a/libs/RVL_SDK/include/revolution/dsp/dsp_task.h +++ b/libs/RVL_SDK/include/revolution/dsp/dsp_task.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/dsp.h" +#include "revolution/os.h" void __DSPHandler(__OSInterrupt, OSContext *); diff --git a/libs/RVL_SDK/include/revolution/dvd.h b/libs/RVL_SDK/include/revolution/dvd.h index 98b05fdc5..a8107a50c 100644 --- a/libs/RVL_SDK/include/revolution/dvd.h +++ b/libs/RVL_SDK/include/revolution/dvd.h @@ -5,9 +5,9 @@ extern "C" { #endif -#include -#include -#include +#include "revolution/esp.h" +#include "revolution/os.h" +#include "revolution/types.h" #include typedef struct DVDDiskID DVDDiskID; diff --git a/libs/RVL_SDK/include/revolution/esp.h b/libs/RVL_SDK/include/revolution/esp.h index 7f83bba0f..bc762c530 100644 --- a/libs/RVL_SDK/include/revolution/esp.h +++ b/libs/RVL_SDK/include/revolution/esp.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/types.h" +#include "private/iostypes.h" typedef u32 ESId; typedef u32 ESContentId; diff --git a/libs/RVL_SDK/include/revolution/fs.h b/libs/RVL_SDK/include/revolution/fs.h index 77dc343bd..25099f150 100644 --- a/libs/RVL_SDK/include/revolution/fs.h +++ b/libs/RVL_SDK/include/revolution/fs.h @@ -1,3 +1,3 @@ #pragma once -#include \ No newline at end of file +#include "revolution/fs/fs.h" \ No newline at end of file diff --git a/libs/RVL_SDK/include/revolution/fs/fs.h b/libs/RVL_SDK/include/revolution/fs/fs.h index 4b47609f6..9d5cd6fe1 100644 --- a/libs/RVL_SDK/include/revolution/fs/fs.h +++ b/libs/RVL_SDK/include/revolution/fs/fs.h @@ -1,9 +1,9 @@ #ifndef FS_H #define FS_H -#include -#include -#include +#include "private/iosrestypes.h" +#include "private/iostypes.h" +#include "revolution/types.h" #ifdef __cplusplus diff --git a/libs/RVL_SDK/include/revolution/gx/GXCpu2Efb.h b/libs/RVL_SDK/include/revolution/gx/GXCpu2Efb.h index 30561f875..315d5acba 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXCpu2Efb.h +++ b/libs/RVL_SDK/include/revolution/gx/GXCpu2Efb.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/gx/GXEnum.h" +#include "revolution/types.h" void GXPokeAlphaMode(GXCompare, u8); void GXPokeAlphaRead(GXAlphaReadMode); diff --git a/libs/RVL_SDK/include/revolution/gx/GXCull.h b/libs/RVL_SDK/include/revolution/gx/GXCull.h index 1c2b47f5c..3b3e7d5c0 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXCull.h +++ b/libs/RVL_SDK/include/revolution/gx/GXCull.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/types.h" +#include "revolution/gx/GXEnum.h" void GXSetCullMode(GXCullMode); void GXSetCoPlanar(GXBool); diff --git a/libs/RVL_SDK/include/revolution/gx/GXDispList.h b/libs/RVL_SDK/include/revolution/gx/GXDispList.h index 009a6f862..66674ee9e 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXDispList.h +++ b/libs/RVL_SDK/include/revolution/gx/GXDispList.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/types.h" void GXBeginDisplayList(void *, u32); u32 GXEndDisplayList(void); diff --git a/libs/RVL_SDK/include/revolution/gx/GXFifo.h b/libs/RVL_SDK/include/revolution/gx/GXFifo.h index 5a9718756..790708c14 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXFifo.h +++ b/libs/RVL_SDK/include/revolution/gx/GXFifo.h @@ -5,9 +5,9 @@ extern "C" { #endif -#include -#include -#include +#include "revolution/types.h" +#include "revolution/gx/GXEnum.h" +#include "revolution/gx/GXStruct.h" typedef void (*GXBreakPtCallback)(void); diff --git a/libs/RVL_SDK/include/revolution/gx/GXFrameBuf.h b/libs/RVL_SDK/include/revolution/gx/GXFrameBuf.h index 7e88e7883..5f42c45b7 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXFrameBuf.h +++ b/libs/RVL_SDK/include/revolution/gx/GXFrameBuf.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/gx.h" void GXSetDispCopySrc(u16, u16, u16, u16); void GXSetTexCopySrc(u16, u16, u16, u16); diff --git a/libs/RVL_SDK/include/revolution/gx/GXGeometry.h b/libs/RVL_SDK/include/revolution/gx/GXGeometry.h index 45b840a0f..a00d3db05 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXGeometry.h +++ b/libs/RVL_SDK/include/revolution/gx/GXGeometry.h @@ -5,9 +5,9 @@ extern "C" { #endif -#include -#include -#include +#include "revolution/types.h" +#include "revolution/gx/GXEnum.h" +#include "revolution/gx/GXStruct.h" void GXSetVtxDesc(GXAttr, GXAttrType); void GXClearVtxDesc(void); diff --git a/libs/RVL_SDK/include/revolution/gx/GXGet.h b/libs/RVL_SDK/include/revolution/gx/GXGet.h index 62773a8cc..944bf2a6f 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXGet.h +++ b/libs/RVL_SDK/include/revolution/gx/GXGet.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/types.h" +#include "revolution/gx.h" void GXGetViewportv(f32 *); diff --git a/libs/RVL_SDK/include/revolution/gx/GXLighting.h b/libs/RVL_SDK/include/revolution/gx/GXLighting.h index e868a3118..c25ab2609 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXLighting.h +++ b/libs/RVL_SDK/include/revolution/gx/GXLighting.h @@ -5,9 +5,9 @@ extern "C" { #endif -#include -#include -#include +#include "revolution/gx/GXEnum.h" +#include "revolution/gx/GXStruct.h" +#include "revolution/types.h" void GXInitLightAttn(GXLightObj*, f32, f32, f32, f32, f32, f32); void GXInitLightPos(GXLightObj*, f32, f32, f32); diff --git a/libs/RVL_SDK/include/revolution/gx/GXManage.h b/libs/RVL_SDK/include/revolution/gx/GXManage.h index a7a336584..21d2c90b8 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXManage.h +++ b/libs/RVL_SDK/include/revolution/gx/GXManage.h @@ -5,10 +5,10 @@ extern "C" { #endif -#include -#include -#include -#include +#include "revolution/gx/GXEnum.h" +#include "revolution/gx/GXFifo.h" +#include "revolution/gx/GXStruct.h" +#include "revolution/types.h" typedef void (*GXDrawSyncCallback)(u16 token); diff --git a/libs/RVL_SDK/include/revolution/gx/GXPerf.h b/libs/RVL_SDK/include/revolution/gx/GXPerf.h index 7641eb862..823e2158a 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXPerf.h +++ b/libs/RVL_SDK/include/revolution/gx/GXPerf.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/types.h" +#include "revolution/gx/GXEnum.h" void GXSetGPMetric(GXPerf0, GXPerf1); void GXClearGPMetric(void); diff --git a/libs/RVL_SDK/include/revolution/gx/GXPixel.h b/libs/RVL_SDK/include/revolution/gx/GXPixel.h index 6f8b8cd4c..1bec5d798 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXPixel.h +++ b/libs/RVL_SDK/include/revolution/gx/GXPixel.h @@ -5,9 +5,9 @@ extern "C" { #endif -#include -#include -#include +#include "revolution/types.h" +#include "revolution/gx/GXEnum.h" +#include "revolution/gx/GXStruct.h" void GXSetFog(GXFogType, f32, f32, f32, f32, GXColor); void GXSetFogRangeAdj(GXBool, u16, const GXFogAdjTable *); diff --git a/libs/RVL_SDK/include/revolution/gx/GXRegs.h b/libs/RVL_SDK/include/revolution/gx/GXRegs.h index acf62efc6..21ed26fdf 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXRegs.h +++ b/libs/RVL_SDK/include/revolution/gx/GXRegs.h @@ -5,24 +5,24 @@ extern "C" { #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "private/bp_reg.h" +#include "private/cp_reg.h" +#include "private/gen_reg.h" +#include "private/pe_reg.h" +#include "private/pi_reg.h" +#include "private/ras_reg.h" +#include "private/su_reg.h" +#include "private/tev_reg.h" +#include "private/tx_reg.h" +#include "revolution/base/PPCWGPipe.h" +#include "revolution/gx/shortcut_bp_reg.h" +#include "revolution/gx/shortcut_cp_reg.h" +#include "revolution/gx/shortcut_gen_reg.h" +#include "revolution/gx/shortcut_pe_reg.h" +#include "revolution/gx/shortcut_pi_cp_reg.h" +#include "revolution/gx/shortcut_ras_reg.h" +#include "revolution/gx/shortcut_su_reg.h" +#include "revolution/gx/shortcut_tev_reg.h" #ifdef __MWERKS__ extern volatile PPCWGPipe gxfifo : 0xCC008000; diff --git a/libs/RVL_SDK/include/revolution/gx/GXStruct.h b/libs/RVL_SDK/include/revolution/gx/GXStruct.h index 9ccdd4d1b..4526b1b90 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXStruct.h +++ b/libs/RVL_SDK/include/revolution/gx/GXStruct.h @@ -5,9 +5,9 @@ extern "C" { #endif -#include -#include -#include +#include "revolution/gx/GXEnum.h" +#include "revolution/types.h" +#include "revolution/vi/vitypes.h" typedef struct _GXColor { u8 r, g, b, a; diff --git a/libs/RVL_SDK/include/revolution/gx/GXTev.h b/libs/RVL_SDK/include/revolution/gx/GXTev.h index 2f298a7c0..e8dc9ccf3 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXTev.h +++ b/libs/RVL_SDK/include/revolution/gx/GXTev.h @@ -5,9 +5,9 @@ extern "C" { #endif -#include -#include -#include +#include "revolution/types.h" +#include "revolution/gx/GXEnum.h" +#include "revolution/gx/GXStruct.h" void GXSetTevOp(GXTevStageID, GXTevMode); void GXSetTevColorIn(GXTevStageID, GXTevColorArg, GXTevColorArg, GXTevColorArg, GXTevColorArg); diff --git a/libs/RVL_SDK/include/revolution/gx/GXTexture.h b/libs/RVL_SDK/include/revolution/gx/GXTexture.h index d1f0e91d8..e6d04b86a 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXTexture.h +++ b/libs/RVL_SDK/include/revolution/gx/GXTexture.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/gx/GXEnum.h" +#include "revolution/gx/GXStruct.h" typedef GXTexRegion* (*GXTexRegionCallback) (const GXTexObj*, GXTexMapID); typedef GXTlutRegion* (*GXTlutRegionCallback)(u32); diff --git a/libs/RVL_SDK/include/revolution/gx/GXTransform.h b/libs/RVL_SDK/include/revolution/gx/GXTransform.h index e750861ce..75546c691 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXTransform.h +++ b/libs/RVL_SDK/include/revolution/gx/GXTransform.h @@ -5,9 +5,9 @@ extern "C" { #endif -#include -#include -#include +#include "revolution/gx/GXEnum.h" +#include "revolution/gx/GXStruct.h" +#include "revolution/types.h" void GXProject(f32 x, f32 y, f32 z, const f32 pMtx[3][4], const f32* pProjection, const f32* pViewport, f32* pScreenX, f32* pScreenY, f32* pScreenZ); diff --git a/libs/RVL_SDK/include/revolution/gx/GXVert.h b/libs/RVL_SDK/include/revolution/gx/GXVert.h index 376f59767..f18da7026 100644 --- a/libs/RVL_SDK/include/revolution/gx/GXVert.h +++ b/libs/RVL_SDK/include/revolution/gx/GXVert.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/base/PPCWGPipe.h" #ifdef __MWERKS__ volatile PPCWGPipe GXWGFifo : 0xCC008000; diff --git a/libs/RVL_SDK/include/revolution/gx/shortcut_cp_reg.h b/libs/RVL_SDK/include/revolution/gx/shortcut_cp_reg.h index c96b6ff23..33c02b618 100644 --- a/libs/RVL_SDK/include/revolution/gx/shortcut_cp_reg.h +++ b/libs/RVL_SDK/include/revolution/gx/shortcut_cp_reg.h @@ -1,4 +1,4 @@ -#include +#include "revolution/gx/GXFDLShortcut.h" #define SC_CP_OPCODE_SET_INDEX(cp_opcode,index) \ FAST_GPFLAGSET(cp_opcode,index,CP_OPCODE_INDEX) diff --git a/libs/RVL_SDK/include/revolution/hbm.h b/libs/RVL_SDK/include/revolution/hbm.h index 7c7c9da12..62a72f709 100644 --- a/libs/RVL_SDK/include/revolution/hbm.h +++ b/libs/RVL_SDK/include/revolution/hbm.h @@ -1,7 +1,7 @@ #ifndef HBM_H #define HBM_H -#include +#include "revolution/hbm/HBMBase.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/hbm/HBMBase.h b/libs/RVL_SDK/include/revolution/hbm/HBMBase.h index 08fbf0088..d115a49fb 100644 --- a/libs/RVL_SDK/include/revolution/hbm/HBMBase.h +++ b/libs/RVL_SDK/include/revolution/hbm/HBMBase.h @@ -1,8 +1,8 @@ #ifndef HBM_BASE_H #define HBM_BASE_H -#include -#include +#include "revolution/kpad.h" +#include "revolution/mem.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/ipc/ipcProfile.h b/libs/RVL_SDK/include/revolution/ipc/ipcProfile.h index 3e9c23f43..a26f5d639 100644 --- a/libs/RVL_SDK/include/revolution/ipc/ipcProfile.h +++ b/libs/RVL_SDK/include/revolution/ipc/ipcProfile.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution.h" void IPCiProfInit(void); void IPCiProfQueueReq(void *, s32); diff --git a/libs/RVL_SDK/include/revolution/ipc/ipcclt.h b/libs/RVL_SDK/include/revolution/ipc/ipcclt.h index 4f568c2d5..5d79a9213 100644 --- a/libs/RVL_SDK/include/revolution/ipc/ipcclt.h +++ b/libs/RVL_SDK/include/revolution/ipc/ipcclt.h @@ -5,9 +5,9 @@ extern "C" { #endif -#include -#include -#include +#include "revolution/types.h" +#include "private/iosrestypes.h" +#include "private/iosresclt.h" s32 IOS_Open(const char *, u32); s32 IOS_Close(s32); diff --git a/libs/RVL_SDK/include/revolution/kpad.h b/libs/RVL_SDK/include/revolution/kpad.h index 48a0c40ba..f6c9a3f12 100644 --- a/libs/RVL_SDK/include/revolution/kpad.h +++ b/libs/RVL_SDK/include/revolution/kpad.h @@ -1,9 +1,9 @@ #ifndef KPAD_H #define KPAD_H -#include -#include -#include +#include "revolution/mtx.h" +#include "revolution/types.h" +#include "revolution/wpad.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/mem.h b/libs/RVL_SDK/include/revolution/mem.h index a36e5d370..5dfab106c 100644 --- a/libs/RVL_SDK/include/revolution/mem.h +++ b/libs/RVL_SDK/include/revolution/mem.h @@ -1,8 +1,8 @@ #ifndef MEM_H #define MEM_H -#include -#include -#include +#include "revolution/mem/allocator.h" +#include "revolution/mem/expHeap.h" +#include "revolution/mem/heapCommon.h" #endif // MEM_H \ No newline at end of file diff --git a/libs/RVL_SDK/include/revolution/mem/allocator.h b/libs/RVL_SDK/include/revolution/mem/allocator.h index 7d999d2c0..faf623620 100644 --- a/libs/RVL_SDK/include/revolution/mem/allocator.h +++ b/libs/RVL_SDK/include/revolution/mem/allocator.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include "revolution/types.h" +#include "revolution/mem/heapCommon.h" typedef struct MEMAllocator MEMAllocator; typedef void* (*MEMFuncAllocatorAlloc)( MEMAllocator* pAllocator, u32 size ); diff --git a/libs/RVL_SDK/include/revolution/mem/expHeap.h b/libs/RVL_SDK/include/revolution/mem/expHeap.h index 6da6a6400..cbe5427cc 100644 --- a/libs/RVL_SDK/include/revolution/mem/expHeap.h +++ b/libs/RVL_SDK/include/revolution/mem/expHeap.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/mem/heapCommon.h" typedef struct MEMiExpHeapMBlockHead MEMiExpHeapMBlockHead; diff --git a/libs/RVL_SDK/include/revolution/mem/heapCommon.h b/libs/RVL_SDK/include/revolution/mem/heapCommon.h index 47d56d35f..b23780f32 100644 --- a/libs/RVL_SDK/include/revolution/mem/heapCommon.h +++ b/libs/RVL_SDK/include/revolution/mem/heapCommon.h @@ -6,8 +6,8 @@ extern "C" { #endif #include -#include -#include +#include "revolution/mem/list.h" +#include "revolution/os.h" typedef struct MEMiHeapHead MEMiHeapHead; diff --git a/libs/RVL_SDK/include/revolution/mem/list.h b/libs/RVL_SDK/include/revolution/mem/list.h index cccd69c97..179dccb73 100644 --- a/libs/RVL_SDK/include/revolution/mem/list.h +++ b/libs/RVL_SDK/include/revolution/mem/list.h @@ -6,7 +6,7 @@ extern "C" { #endif #include -#include +#include "revolution/types.h" typedef struct { diff --git a/libs/RVL_SDK/include/revolution/mtx.h b/libs/RVL_SDK/include/revolution/mtx.h index 34462943d..3289b1d5c 100644 --- a/libs/RVL_SDK/include/revolution/mtx.h +++ b/libs/RVL_SDK/include/revolution/mtx.h @@ -1,7 +1,7 @@ #ifndef MTX_H #define MTX_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nand.h b/libs/RVL_SDK/include/revolution/nand.h index 790a0bac6..70855acb0 100644 --- a/libs/RVL_SDK/include/revolution/nand.h +++ b/libs/RVL_SDK/include/revolution/nand.h @@ -1,9 +1,9 @@ #ifndef NAND_H #define NAND_H -#include -#include -#include +#include "revolution/fs.h" +#include "revolution/nand/nandlogging.h" +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nand/nandlogging.h b/libs/RVL_SDK/include/revolution/nand/nandlogging.h index 47082b6df..68ed30d15 100644 --- a/libs/RVL_SDK/include/revolution/nand/nandlogging.h +++ b/libs/RVL_SDK/include/revolution/nand/nandlogging.h @@ -1,7 +1,7 @@ #ifndef NANDLOGGING_H #define NANDLOGGING_H -#include +#include "revolution/os.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24.h b/libs/RVL_SDK/include/revolution/nwc24.h index 9c1c1f00c..c3808cde1 100644 --- a/libs/RVL_SDK/include/revolution/nwc24.h +++ b/libs/RVL_SDK/include/revolution/nwc24.h @@ -6,20 +6,20 @@ extern "C" { #endif -#include +#include "revolution.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "revolution/nwc24/NWC24Config.h" +#include "revolution/nwc24/NWC24Download.h" +#include "revolution/nwc24/NWC24FileApi.h" +#include "revolution/nwc24/NWC24Manage.h" +#include "revolution/nwc24/NWC24Mime.h" +#include "revolution/nwc24/NWC24MsgCommit.h" +#include "revolution/nwc24/NWC24MsgObj.h" +#include "revolution/nwc24/NWC24Parser.h" +#include "revolution/nwc24/NWC24Schedule.h" +#include "revolution/nwc24/NWC24System.h" +#include "revolution/nwc24/NWC24Types.h" +#include "revolution/nwc24/NWC24Utils.h" #ifdef __cplusplus } diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24Config.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24Config.h index 612d1c4cd..759082b53 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24Config.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24Config.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_CONFIG_H #define RVL_SDK_NWC24_CONFIG_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24Download.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24Download.h index bd850369f..00df8bbb5 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24Download.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24Download.h @@ -1,10 +1,10 @@ #ifndef RVL_SDK_NWC24_DOWNLOAD_H #define RVL_SDK_NWC24_DOWNLOAD_H -#include +#include "revolution/types.h" #include -#include -#include +#include "revolution/fs.h" +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24FileApi.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24FileApi.h index f7b330c01..597c8d0a4 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24FileApi.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24FileApi.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_FILE_API_H #define RVL_SDK_NWC24_FILE_API_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24Internal.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24Internal.h index dccca85de..1d596c670 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24Internal.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24Internal.h @@ -4,23 +4,23 @@ extern "C" { #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "revolution/nwc24/internal/NWC24iConfig.h" +#include "revolution/nwc24/internal/NWC24iDateParser.h" +#include "revolution/nwc24/internal/NWC24iDownload.h" +#include "revolution/nwc24/internal/NWC24iFileApi.h" +#include "revolution/nwc24/internal/NWC24iFriendList.h" +#include "revolution/nwc24/internal/NWC24iIpc.h" +#include "revolution/nwc24/internal/NWC24iMBoxCtrl.h" +#include "revolution/nwc24/internal/NWC24iManage.h" +#include "revolution/nwc24/internal/NWC24iMsgCommit.h" +#include "revolution/nwc24/internal/NWC24iMsgObj.h" +#include "revolution/nwc24/internal/NWC24iParser.h" +#include "revolution/nwc24/internal/NWC24iSchedule.h" +#include "revolution/nwc24/internal/NWC24iSecretFList.h" +#include "revolution/nwc24/internal/NWC24iStdApi.h" +#include "revolution/nwc24/internal/NWC24iSystem.h" +#include "revolution/nwc24/internal/NWC24iTime.h" +#include "revolution/nwc24/internal/NWC24iUtils.h" #ifdef __cplusplus } diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24Manage.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24Manage.h index 50a871272..21236581e 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24Manage.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24Manage.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_MANAGE_H #define RVL_SDK_NWC24_MANAGE_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24Mime.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24Mime.h index d294b4a2c..4565becfc 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24Mime.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24Mime.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_MIME_H #define RVL_SDK_NWC24_MIME_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24MsgCommit.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24MsgCommit.h index 092edfea6..2b0144b93 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24MsgCommit.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24MsgCommit.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_MSG_COMMIT_H #define RVL_SDK_NWC24_MSG_COMMIT_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24MsgObj.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24MsgObj.h index b7822f309..5abe6cc5a 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24MsgObj.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24MsgObj.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_MSG_OBJ_H #define RVL_SDK_NWC24_MSG_OBJ_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24Parser.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24Parser.h index 9c5b738df..43aeffeaa 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24Parser.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24Parser.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_PARSER_H #define RVL_SDK_NWC24_PARSER_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24Schedule.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24Schedule.h index 9a8e47a99..8a9774c63 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24Schedule.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24Schedule.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_SCHEDULE_H #define RVL_SDK_NWC24_SCHEDULE_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24System.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24System.h index e4df1d36d..2c44d5643 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24System.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24System.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_SYSTEM_H #define RVL_SDK_NWC24_SYSTEM_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24Types.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24Types.h index f185bd3c6..dff17405b 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24Types.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24Types.h @@ -1,10 +1,10 @@ #ifndef RVL_SDK_NWC24_TYPES_H #define RVL_SDK_NWC24_TYPES_H -#include +#include "revolution/types.h" #include -#include -#include +#include "revolution/nand.h" +#include "revolution/vf.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/NWC24Utils.h b/libs/RVL_SDK/include/revolution/nwc24/NWC24Utils.h index b5de9cdc3..5d03ee977 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/NWC24Utils.h +++ b/libs/RVL_SDK/include/revolution/nwc24/NWC24Utils.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_UTILS_H #define RVL_SDK_NWC24_UTILS_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iConfig.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iConfig.h index 42db997ac..be54b2d45 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iConfig.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iConfig.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_INTERNAL_CONFIG_H #define RVL_SDK_NWC24_INTERNAL_CONFIG_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iDateParser.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iDateParser.h index 7c921cc4b..d9e51ec0a 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iDateParser.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iDateParser.h @@ -1,11 +1,11 @@ #ifndef RVL_SDK_NWC24_INTERNAL_DATE_PARSER_H #define RVL_SDK_NWC24_INTERNAL_DATE_PARSER_H -#include +#include "revolution/types.h" #include -#include -#include -#include +#include "revolution/nwc24/NWC24Types.h" +#include "revolution/nwc24/NWC24Utils.h" +#include "revolution/os.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iDownload.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iDownload.h index b8ac6c7fa..465dd0a7c 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iDownload.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iDownload.h @@ -1,10 +1,10 @@ #ifndef RVL_SDK_NWC24_INTERNAL_DOWNLOAD_H #define RVL_SDK_NWC24_INTERNAL_DOWNLOAD_H -#include +#include "revolution/types.h" #include -#include -#include +#include "revolution/nand.h" +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iFileApi.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iFileApi.h index e94d474ae..80d571e48 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iFileApi.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iFileApi.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_INTERNAL_FILE_API_H #define RVL_SDK_NWC24_INTERNAL_FILE_API_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iFriendList.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iFriendList.h index 91523c7c2..26e3ecdf3 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iFriendList.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iFriendList.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_INTERNAL_FRIEND_LIST_H #define RVL_SDK_NWC24_INTERNAL_FRIEND_LIST_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iIpc.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iIpc.h index 057442e5c..48f80db16 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iIpc.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iIpc.h @@ -1,10 +1,10 @@ #ifndef RVL_SDK_NWC24_INTERNAL_IPC_H #define RVL_SDK_NWC24_INTERNAL_IPC_H -#include +#include "revolution/types.h" #include -#include -#include +#include "revolution/ipc.h" +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMBoxCtrl.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMBoxCtrl.h index 810bb6fbc..2e47e6a33 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMBoxCtrl.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMBoxCtrl.h @@ -1,10 +1,10 @@ #ifndef RVL_SDK_NWC24_INTERNAL_MBOX_CTRL_H #define RVL_SDK_NWC24_INTERNAL_MBOX_CTRL_H -#include +#include "revolution/types.h" #include -#include -#include +#include "revolution/nwc24/NWC24Types.h" +#include "revolution/nwc24/internal/NWC24iMsgObj.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iManage.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iManage.h index 7789c4117..28a8e0089 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iManage.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iManage.h @@ -1,15 +1,15 @@ #ifndef RVL_SDK_NWC24_INTERNAL_MANAGE_H #define RVL_SDK_NWC24_INTERNAL_MANAGE_H -#include +#include "revolution/types.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "revolution/nwc24/NWC24Mime.h" +#include "revolution/nwc24/NWC24Types.h" +#include "revolution/nwc24/internal/NWC24iConfig.h" +#include "revolution/nwc24/internal/NWC24iDownload.h" +#include "revolution/nwc24/internal/NWC24iFriendList.h" +#include "revolution/nwc24/internal/NWC24iMBoxCtrl.h" +#include "revolution/nwc24/internal/NWC24iSecretFList.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMsgCommit.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMsgCommit.h index 49b684fbd..54fd3b0fe 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMsgCommit.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMsgCommit.h @@ -1,10 +1,10 @@ #ifndef RVL_SDK_NWC24_INTERNAL_MSG_COMMIT_H #define RVL_SDK_NWC24_INTERNAL_MSG_COMMIT_H -#include +#include "revolution/types.h" #include -#include -#include +#include "revolution/nwc24/NWC24Types.h" +#include "revolution/nwc24/internal/NWC24iMBoxCtrl.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMsgObj.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMsgObj.h index 71d9da455..45ba9390b 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMsgObj.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iMsgObj.h @@ -1,10 +1,10 @@ #ifndef RVL_SDK_NWC24_INTERNAL_MSG_OBJ_H #define RVL_SDK_NWC24_INTERNAL_MSG_OBJ_H -#include +#include "revolution/types.h" #include -#include -#include +#include "revolution/nwc24/NWC24Types.h" +#include "revolution/nwc24/NWC24Utils.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iParser.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iParser.h index 80179d889..e1419ae72 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iParser.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iParser.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_INTERNAL_PARSER_H #define RVL_SDK_NWC24_INTERNAL_PARSER_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSchedule.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSchedule.h index 06f22d66b..d4416c0f7 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSchedule.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSchedule.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_INTERNAL_SCHEDULE_H #define RVL_SDK_NWC24_INTERNAL_SCHEDULE_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSecretFList.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSecretFList.h index de2c6b074..c7c69c400 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSecretFList.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSecretFList.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_INTERNAL_SECRET_FRIEND_LIST_H #define RVL_SDK_NWC24_INTERNAL_SECRET_FRIEND_LIST_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iStdApi.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iStdApi.h index c00d9ae8d..b3771be2c 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iStdApi.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iStdApi.h @@ -1,6 +1,6 @@ #ifndef RVL_SDK_NWC24_INTERNAL_STD_API_H #define RVL_SDK_NWC24_INTERNAL_STD_API_H -#include +#include "revolution/types.h" #include #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSystem.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSystem.h index 09210c425..2d6cb1787 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSystem.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iSystem.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_INTERNAL_SYSTEM_H #define RVL_SDK_NWC24_INTERNAL_SYSTEM_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iTime.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iTime.h index 957505d46..1bc7cf59d 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iTime.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iTime.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_INTERNAL_TIME_H #define RVL_SDK_NWC24_INTERNAL_TIME_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iUtils.h b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iUtils.h index 1793a4c60..3871ccfb9 100644 --- a/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iUtils.h +++ b/libs/RVL_SDK/include/revolution/nwc24/internal/NWC24iUtils.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_NWC24_INTERNAL_UTILS_H #define RVL_SDK_NWC24_INTERNAL_UTILS_H -#include +#include "revolution/types.h" #include -#include +#include "revolution/nwc24/NWC24Types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/os.h b/libs/RVL_SDK/include/revolution/os.h index ed1de4042..ae7c84077 100644 --- a/libs/RVL_SDK/include/revolution/os.h +++ b/libs/RVL_SDK/include/revolution/os.h @@ -2,7 +2,7 @@ #define OS_H #include -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { @@ -173,28 +173,28 @@ inline void OSf32tou8(f32* f, u8* out) { } #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "revolution/base/PPCArch.h" +#include "revolution/gx.h" +#include "revolution/os/OSAlarm.h" +#include "revolution/os/OSAlloc.h" +#include "revolution/os/OSCache.h" +#include "revolution/os/OSContext.h" +#include "revolution/os/OSException.h" +#include "revolution/os/OSExecParams.h" +#include "revolution/os/OSFastCast.h" +#include "revolution/os/OSFont.h" +#include "revolution/os/OSInterrupt.h" +#include "revolution/os/OSMessage.h" +#include "revolution/os/OSMutex.h" +#include "revolution/os/OSPlayRecord.h" +#include "revolution/os/OSPlayTime.h" +#include "revolution/os/OSReset.h" +#include "revolution/os/OSResetSW.h" +#include "revolution/os/OSRtc.h" +#include "revolution/os/OSStateFlags.h" +#include "revolution/os/OSStateTM.h" +#include "revolution/os/OSThread.h" +#include "revolution/os/OSTime.h" /* PRIVATE OS FUNCTIONS */ void __OSInitSystemCall(void); diff --git a/libs/RVL_SDK/include/revolution/os/OSAlarm.h b/libs/RVL_SDK/include/revolution/os/OSAlarm.h index bfeab2f20..587cc6c62 100644 --- a/libs/RVL_SDK/include/revolution/os/OSAlarm.h +++ b/libs/RVL_SDK/include/revolution/os/OSAlarm.h @@ -1,9 +1,9 @@ #ifndef OSALARM_H #define OSALARM_H -#include -#include -#include +#include "revolution/types.h" +#include "revolution/os/OSContext.h" +#include "revolution/os/OSTime.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSAlloc.h b/libs/RVL_SDK/include/revolution/os/OSAlloc.h index 5ed7e9d5c..2ad198f3c 100644 --- a/libs/RVL_SDK/include/revolution/os/OSAlloc.h +++ b/libs/RVL_SDK/include/revolution/os/OSAlloc.h @@ -1,7 +1,7 @@ #ifndef OSALLOC_H #define OSALLOC_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSBootInfo.h b/libs/RVL_SDK/include/revolution/os/OSBootInfo.h index a603cfd12..ca2d9c4a7 100644 --- a/libs/RVL_SDK/include/revolution/os/OSBootInfo.h +++ b/libs/RVL_SDK/include/revolution/os/OSBootInfo.h @@ -1,7 +1,7 @@ #ifndef OSBOOTINFO_H #define OSBOOTINFO_H -#include +#include "revolution/dvd.h" typedef struct OSBootInfo_s { DVDDiskID DVDDiskID; diff --git a/libs/RVL_SDK/include/revolution/os/OSCache.h b/libs/RVL_SDK/include/revolution/os/OSCache.h index 56eb7cfe0..16fc3d22a 100644 --- a/libs/RVL_SDK/include/revolution/os/OSCache.h +++ b/libs/RVL_SDK/include/revolution/os/OSCache.h @@ -1,9 +1,9 @@ #ifndef OSCACHE_H #define OSCACHE_H -#include -#include -#include +#include "revolution/types.h" +#include "revolution/os/OSContext.h" +#include "revolution/os/OSError.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSContext.h b/libs/RVL_SDK/include/revolution/os/OSContext.h index dd7eb0bd9..4e0f18bba 100644 --- a/libs/RVL_SDK/include/revolution/os/OSContext.h +++ b/libs/RVL_SDK/include/revolution/os/OSContext.h @@ -1,7 +1,7 @@ #ifndef OSCONTEXT_H #define OSCONTEXT_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSError.h b/libs/RVL_SDK/include/revolution/os/OSError.h index 67172de3f..0be8f0e7f 100644 --- a/libs/RVL_SDK/include/revolution/os/OSError.h +++ b/libs/RVL_SDK/include/revolution/os/OSError.h @@ -1,8 +1,8 @@ #ifndef OSERROR_H #define OSERROR_H -#include -#include +#include "revolution/os/OSContext.h" +#include "revolution/types.h" #ifdef __cplusplus diff --git a/libs/RVL_SDK/include/revolution/os/OSException.h b/libs/RVL_SDK/include/revolution/os/OSException.h index 2aa665daa..954b78c21 100644 --- a/libs/RVL_SDK/include/revolution/os/OSException.h +++ b/libs/RVL_SDK/include/revolution/os/OSException.h @@ -1,8 +1,8 @@ #ifndef OSEXCEPTION_H #define OSEXCEPTION_H -#include -#include +#include "revolution/os/OSContext.h" +#include "revolution/types.h" #ifdef __cplusplus diff --git a/libs/RVL_SDK/include/revolution/os/OSExecParams.h b/libs/RVL_SDK/include/revolution/os/OSExecParams.h index 48802f1ed..f89352d60 100644 --- a/libs/RVL_SDK/include/revolution/os/OSExecParams.h +++ b/libs/RVL_SDK/include/revolution/os/OSExecParams.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/types.h" typedef struct { BOOL valid; diff --git a/libs/RVL_SDK/include/revolution/os/OSFont.h b/libs/RVL_SDK/include/revolution/os/OSFont.h index 125fd03b7..2793bfb1a 100644 --- a/libs/RVL_SDK/include/revolution/os/OSFont.h +++ b/libs/RVL_SDK/include/revolution/os/OSFont.h @@ -1,4 +1,4 @@ -#include +#include "revolution/types.h" typedef struct OSFontHeader { u16 fontType; diff --git a/libs/RVL_SDK/include/revolution/os/OSInterrupt.h b/libs/RVL_SDK/include/revolution/os/OSInterrupt.h index d351ecad2..1de56a01e 100644 --- a/libs/RVL_SDK/include/revolution/os/OSInterrupt.h +++ b/libs/RVL_SDK/include/revolution/os/OSInterrupt.h @@ -1,10 +1,10 @@ #ifndef __OSINTERRUPT_H__ #define __OSINTERRUPT_H__ -#include -#include -#include -#include +#include "revolution/os/OSContext.h" +#include "revolution/os/OSException.h" +#include "revolution/os/OSTime.h" +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSMessage.h b/libs/RVL_SDK/include/revolution/os/OSMessage.h index 478597907..d63fac174 100644 --- a/libs/RVL_SDK/include/revolution/os/OSMessage.h +++ b/libs/RVL_SDK/include/revolution/os/OSMessage.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/os/OSThread.h" typedef struct OSMessageQueue OSMessageQueue; typedef void* OSMessage; diff --git a/libs/RVL_SDK/include/revolution/os/OSModule.h b/libs/RVL_SDK/include/revolution/os/OSModule.h index 2c196f065..04f079a7f 100644 --- a/libs/RVL_SDK/include/revolution/os/OSModule.h +++ b/libs/RVL_SDK/include/revolution/os/OSModule.h @@ -1,7 +1,7 @@ #ifndef OSMODULE_H #define OSMODULE_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSMutex.h b/libs/RVL_SDK/include/revolution/os/OSMutex.h index 848a85ed5..57624f646 100644 --- a/libs/RVL_SDK/include/revolution/os/OSMutex.h +++ b/libs/RVL_SDK/include/revolution/os/OSMutex.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/os/OSThread.h" struct OSMutex { OSThreadQueue queue; diff --git a/libs/RVL_SDK/include/revolution/os/OSPlayRecord.h b/libs/RVL_SDK/include/revolution/os/OSPlayRecord.h index d2b430819..f53c4bf0e 100644 --- a/libs/RVL_SDK/include/revolution/os/OSPlayRecord.h +++ b/libs/RVL_SDK/include/revolution/os/OSPlayRecord.h @@ -1,8 +1,8 @@ #ifndef OSPLAYRECORD_H #define OSPLAYRECORD_H -#include -#include +#include "revolution/types.h" +#include "revolution/os/OSTime.h" typedef struct { u32 checkSum; diff --git a/libs/RVL_SDK/include/revolution/os/OSPlayTime.h b/libs/RVL_SDK/include/revolution/os/OSPlayTime.h index a19c4d465..44c7e0ae6 100644 --- a/libs/RVL_SDK/include/revolution/os/OSPlayTime.h +++ b/libs/RVL_SDK/include/revolution/os/OSPlayTime.h @@ -1,7 +1,7 @@ #ifndef OSPLAYTIME_H #define OSPLAYTIME_H -#include +#include "revolution/esp.h" typedef enum { OSPLAYTIME_PERMANENT = 0, diff --git a/libs/RVL_SDK/include/revolution/os/OSReset.h b/libs/RVL_SDK/include/revolution/os/OSReset.h index ef79c76ce..b3f20807b 100644 --- a/libs/RVL_SDK/include/revolution/os/OSReset.h +++ b/libs/RVL_SDK/include/revolution/os/OSReset.h @@ -1,7 +1,7 @@ #ifndef OSRESET_H #define OSRESET_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSRtc.h b/libs/RVL_SDK/include/revolution/os/OSRtc.h index 28a1ea9dd..ae6f1e6cd 100644 --- a/libs/RVL_SDK/include/revolution/os/OSRtc.h +++ b/libs/RVL_SDK/include/revolution/os/OSRtc.h @@ -1,7 +1,7 @@ #ifndef OSRTC_H #define OSRTC_H -#include +#include "revolution/types.h" typedef struct OSSram { u16 checkSum; diff --git a/libs/RVL_SDK/include/revolution/os/OSStateFlags.h b/libs/RVL_SDK/include/revolution/os/OSStateFlags.h index a9b6df3b7..5fb486c8d 100644 --- a/libs/RVL_SDK/include/revolution/os/OSStateFlags.h +++ b/libs/RVL_SDK/include/revolution/os/OSStateFlags.h @@ -1,7 +1,7 @@ #ifndef OSSTATEFLAGS_H #define OSSTATEFLAGS_H -#include +#include "revolution/types.h" typedef struct { u32 checkSum; diff --git a/libs/RVL_SDK/include/revolution/os/OSStateTM.h b/libs/RVL_SDK/include/revolution/os/OSStateTM.h index 37a6ec3b9..094897dcc 100644 --- a/libs/RVL_SDK/include/revolution/os/OSStateTM.h +++ b/libs/RVL_SDK/include/revolution/os/OSStateTM.h @@ -1,7 +1,7 @@ #ifndef OSSTATETM_H #define OSSTATETM_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSThread.h b/libs/RVL_SDK/include/revolution/os/OSThread.h index 4c5a6d468..db80c9665 100644 --- a/libs/RVL_SDK/include/revolution/os/OSThread.h +++ b/libs/RVL_SDK/include/revolution/os/OSThread.h @@ -1,8 +1,8 @@ #ifndef OSTHREAD_H #define OSTHREAD_H -#include -#include +#include "revolution/os/OSContext.h" +#include "revolution/os/OSTime.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSTime.h b/libs/RVL_SDK/include/revolution/os/OSTime.h index 3f50fb770..f66a21091 100644 --- a/libs/RVL_SDK/include/revolution/os/OSTime.h +++ b/libs/RVL_SDK/include/revolution/os/OSTime.h @@ -1,7 +1,7 @@ #ifndef OSTIME_H #define OSTIME_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/os/OSTitle.h b/libs/RVL_SDK/include/revolution/os/OSTitle.h index ad86447b4..08ccd5d24 100644 --- a/libs/RVL_SDK/include/revolution/os/OSTitle.h +++ b/libs/RVL_SDK/include/revolution/os/OSTitle.h @@ -1,7 +1,7 @@ #ifndef OSTITLE_H #define OSTITLE_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/pad.h b/libs/RVL_SDK/include/revolution/pad.h index da7b17da9..c5d955c70 100644 --- a/libs/RVL_SDK/include/revolution/pad.h +++ b/libs/RVL_SDK/include/revolution/pad.h @@ -1,3 +1,3 @@ -#include +#include "revolution/os.h" BOOL __PADDisableRecalibration(BOOL disable); \ No newline at end of file diff --git a/libs/RVL_SDK/include/revolution/sc.h b/libs/RVL_SDK/include/revolution/sc.h index cce7c14f8..487e07b38 100644 --- a/libs/RVL_SDK/include/revolution/sc.h +++ b/libs/RVL_SDK/include/revolution/sc.h @@ -2,8 +2,8 @@ #define SC_H #include "revolution/bte.h" -#include -#include +#include "revolution/nand.h" +#include "revolution/os.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/si.h b/libs/RVL_SDK/include/revolution/si.h index 12f538bd0..2fcb71268 100644 --- a/libs/RVL_SDK/include/revolution/si.h +++ b/libs/RVL_SDK/include/revolution/si.h @@ -1,7 +1,7 @@ #ifndef SI_H #define SI_H -#include +#include "revolution/os.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/thp.h b/libs/RVL_SDK/include/revolution/thp.h index 3b88211ce..6ea1a395a 100644 --- a/libs/RVL_SDK/include/revolution/thp.h +++ b/libs/RVL_SDK/include/revolution/thp.h @@ -1,7 +1,7 @@ #ifndef THP_H #define THP_H -#include +#include "revolution.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/vf/d_hash.h b/libs/RVL_SDK/include/revolution/vf/d_hash.h index e518a0111..8dad70d25 100644 --- a/libs/RVL_SDK/include/revolution/vf/d_hash.h +++ b/libs/RVL_SDK/include/revolution/vf/d_hash.h @@ -1,7 +1,7 @@ #ifndef D_HASH_H #define D_HASH_H -#include +#include "revolution.h" int _MakeWStr(const char*); void dHash_InitHashTable(); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_api_util.h b/libs/RVL_SDK/include/revolution/vf/pf_api_util.h index 33e1a65db..18302b186 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_api_util.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_api_util.h @@ -1,7 +1,7 @@ #ifndef PF_API_UTIL_H #define PF_API_UTIL_H -#include +#include "revolution.h" u32 VFiPFAPI_ParseOpenModeString(const char*); int VFiPFAPI_convertError(int); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_detach.h b/libs/RVL_SDK/include/revolution/vf/pf_detach.h index 97784105e..2a4b23824 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_detach.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_detach.h @@ -1,7 +1,7 @@ #ifndef PF_DETACH_H #define PF_DETACH_H -#include +#include "revolution.h" int VFipf2_detach(s8); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_fatfs.h b/libs/RVL_SDK/include/revolution/vf/pf_fatfs.h index e800405c0..63aacca72 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_fatfs.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_fatfs.h @@ -1,7 +1,7 @@ #ifndef PF_FATFS_H #define PF_FATFS_H -#include +#include "revolution.h" int VFiPFFATFS_initializeFATFS(u32 config, void* param); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_fopen.h b/libs/RVL_SDK/include/revolution/vf/pf_fopen.h index 6661c6f1b..caa2ca714 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_fopen.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_fopen.h @@ -1,7 +1,7 @@ #ifndef PF_FOPEN_H #define PF_FOPEN_H -#include +#include "revolution/types.h" struct PF_FILE* VFipf2_fopen(const s8* path, const s8* mode); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_fread.h b/libs/RVL_SDK/include/revolution/vf/pf_fread.h index 18cc4b4d1..59e482dce 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_fread.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_fread.h @@ -1,7 +1,7 @@ #ifndef PF_FREAD_H #define PF_FREAD_H -#include +#include "revolution/types.h" #include "revolution/vf/vf_struct.h" s32 VFipf2_fread(u8* p_buf, u32 size, u32 count, PF_FILE* p_file); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_fwrite.h b/libs/RVL_SDK/include/revolution/vf/pf_fwrite.h index 756b8fbed..56080ea69 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_fwrite.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_fwrite.h @@ -1,7 +1,7 @@ #ifndef PF_FWRITE_H #define PF_FWRITE_H -#include +#include "revolution/types.h" #include "revolution/vf/vf_struct.h" u32 VFipf2_fwrite(u8* p_buf, u32 size, u32 count, PF_FILE* p_file); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_getdev.h b/libs/RVL_SDK/include/revolution/vf/pf_getdev.h index 7eda2bc3a..ef78cd232 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_getdev.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_getdev.h @@ -1,7 +1,7 @@ #ifndef PF_GETDEV_H #define PF_GETDEV_H -#include +#include "revolution/types.h" #include "revolution/vf/vf_struct.h" s32 VFipf2_devinf(s8 drv_char, PF_DEV_INF* dev_inf); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_init_prfile2.h b/libs/RVL_SDK/include/revolution/vf/pf_init_prfile2.h index 481e137d7..1ed3cdc2b 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_init_prfile2.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_init_prfile2.h @@ -1,7 +1,7 @@ #ifndef PF_INIT_PRFILE2_H #define PF_INIT_PRFILE2_H -#include +#include "revolution/types.h" s32 VFipf2_init_prfile2(s32 config, void* param); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_str.h b/libs/RVL_SDK/include/revolution/vf/pf_str.h index e1e24673e..0ab1286ed 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_str.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_str.h @@ -1,7 +1,7 @@ #ifndef PF_STR_H #define PF_STR_H -#include +#include "revolution/types.h" #include "revolution/vf/vf_struct.h" s32 VFiPFSTR_InitStr(PF_STR *p_str, const s8 *s, u32 code_mode); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_system.h b/libs/RVL_SDK/include/revolution/vf/pf_system.h index e9a922acc..be35739ee 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_system.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_system.h @@ -1,7 +1,7 @@ #ifndef PF_SYSTEM_H #define PF_SYSTEM_H -#include +#include "revolution/types.h" #include "revolution/vf/vf_struct.h" void VFiPFSYS_initializeSYS(void); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_unmount.h b/libs/RVL_SDK/include/revolution/vf/pf_unmount.h index ec5150750..8251600dc 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_unmount.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_unmount.h @@ -1,7 +1,7 @@ #ifndef PF_UNMOUNT_H #define PF_UNMOUNT_H -#include +#include "revolution/types.h" s32 VFipf2_unmount(s8 drv_char, u32 mode); diff --git a/libs/RVL_SDK/include/revolution/vf/pf_volume.h b/libs/RVL_SDK/include/revolution/vf/pf_volume.h index d6b5c7971..401cc9de6 100644 --- a/libs/RVL_SDK/include/revolution/vf/pf_volume.h +++ b/libs/RVL_SDK/include/revolution/vf/pf_volume.h @@ -2,7 +2,7 @@ #define PF_VOLUME_H #include "revolution/vf/vf_struct.h" -#include +#include "revolution.h" s32 VFiPFVOL_InitModule(u32 config, void* param); s32 VFiPFVOL_errnum(void); diff --git a/libs/RVL_SDK/include/revolution/vi.h b/libs/RVL_SDK/include/revolution/vi.h index 1fd5c68a6..6fe29889b 100644 --- a/libs/RVL_SDK/include/revolution/vi.h +++ b/libs/RVL_SDK/include/revolution/vi.h @@ -1,10 +1,10 @@ #ifndef VI_H #define VI_H -#include -#include -#include -#include +#include "revolution/vi/vi3in1.h" +#include "revolution/vi/vi3in1types.h" +#include "revolution/vi/vifuncs.h" +#include "revolution/vi/vitypes.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/vi/vi3in1.h b/libs/RVL_SDK/include/revolution/vi/vi3in1.h index 35ee2a107..c723d1c87 100644 --- a/libs/RVL_SDK/include/revolution/vi/vi3in1.h +++ b/libs/RVL_SDK/include/revolution/vi/vi3in1.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/vi/vi3in1types.h" typedef enum _VIGamma { VI_GM_0_1 = 1, diff --git a/libs/RVL_SDK/include/revolution/vi/vi3in1types.h b/libs/RVL_SDK/include/revolution/vi/vi3in1types.h index c682281e8..7215a6864 100644 --- a/libs/RVL_SDK/include/revolution/vi/vi3in1types.h +++ b/libs/RVL_SDK/include/revolution/vi/vi3in1types.h @@ -1,7 +1,7 @@ #ifndef VI3IN1TYPES_H #define VI3IN1TYPES_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/vi/vifuncs.h b/libs/RVL_SDK/include/revolution/vi/vifuncs.h index 677cc5bb3..45f2bd93d 100644 --- a/libs/RVL_SDK/include/revolution/vi/vifuncs.h +++ b/libs/RVL_SDK/include/revolution/vi/vifuncs.h @@ -1,9 +1,9 @@ #ifndef VIFUNCS_H #define VIFUNCS_H -#include -#include -#include +#include "revolution/types.h" +#include "revolution/vi/vitypes.h" +#include "revolution/gx/GXStruct.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/vi/vitypes.h b/libs/RVL_SDK/include/revolution/vi/vitypes.h index bd956b93d..422c895bd 100644 --- a/libs/RVL_SDK/include/revolution/vi/vitypes.h +++ b/libs/RVL_SDK/include/revolution/vi/vitypes.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/types.h" #define VI_DISPLAY_PIX_SZ 2 diff --git a/libs/RVL_SDK/include/revolution/wenc.h b/libs/RVL_SDK/include/revolution/wenc.h index 6757bdcad..29cf78230 100644 --- a/libs/RVL_SDK/include/revolution/wenc.h +++ b/libs/RVL_SDK/include/revolution/wenc.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include "revolution/types.h" typedef enum { WENC_FLAG_USER_INFO = (1 << 0), diff --git a/libs/RVL_SDK/include/revolution/wpad.h b/libs/RVL_SDK/include/revolution/wpad.h index 68e145883..e8a4845bf 100644 --- a/libs/RVL_SDK/include/revolution/wpad.h +++ b/libs/RVL_SDK/include/revolution/wpad.h @@ -1,9 +1,9 @@ #ifndef WPAD_H #define WPAD_H -#include -#include -#include +#include "revolution/os.h" +#include "revolution/sc.h" +#include "revolution/types.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/wud.h b/libs/RVL_SDK/include/revolution/wud.h index 4893e2cab..b6031e48a 100644 --- a/libs/RVL_SDK/include/revolution/wud.h +++ b/libs/RVL_SDK/include/revolution/wud.h @@ -8,10 +8,10 @@ extern "C" { #endif -#include -#include -#include -#include +#include "revolution/wud/WUDHidHost.h" +#include "revolution/wud/WUDInternal.h" +#include "revolution/wud/debug_msg.h" +#include "revolution/wud/wud.h" #ifdef __cplusplus } diff --git a/libs/RVL_SDK/include/revolution/wud/WUDHidHost.h b/libs/RVL_SDK/include/revolution/wud/WUDHidHost.h index 3677720dd..3b376d79c 100644 --- a/libs/RVL_SDK/include/revolution/wud/WUDHidHost.h +++ b/libs/RVL_SDK/include/revolution/wud/WUDHidHost.h @@ -1,7 +1,7 @@ #ifndef RVL_SDK_WUD_HID_HOST_H #define RVL_SDK_WUD_HID_HOST_H -#include -#include +#include "revolution/bte.h" +#include "revolution/types.h" #ifdef __cplusplus diff --git a/libs/RVL_SDK/include/revolution/wud/WUDInternal.h b/libs/RVL_SDK/include/revolution/wud/WUDInternal.h index 83700dde6..ab607a0c0 100644 --- a/libs/RVL_SDK/include/revolution/wud/WUDInternal.h +++ b/libs/RVL_SDK/include/revolution/wud/WUDInternal.h @@ -1,10 +1,10 @@ #ifndef WUDINTERNAL_H #define WUDINTERNAL_H -#include -#include -#include -#include +#include "revolution/bte.h" +#include "revolution/os.h" +#include "revolution/sc.h" +#include "revolution/wud/wud.h" #ifdef __cplusplus extern "C" { diff --git a/libs/RVL_SDK/include/revolution/wud/debug_msg.h b/libs/RVL_SDK/include/revolution/wud/debug_msg.h index 49086ca63..e8227a088 100644 --- a/libs/RVL_SDK/include/revolution/wud/debug_msg.h +++ b/libs/RVL_SDK/include/revolution/wud/debug_msg.h @@ -1,6 +1,6 @@ #ifndef RVL_SDK_WUD_DEBUG_MSG_H #define RVL_SDK_WUD_DEBUG_MSG_H -#include +#include "revolution/types.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/RVL_SDK/include/revolution/wud/wud.h b/libs/RVL_SDK/include/revolution/wud/wud.h index 6d7076dae..4f282e025 100644 --- a/libs/RVL_SDK/include/revolution/wud/wud.h +++ b/libs/RVL_SDK/include/revolution/wud/wud.h @@ -1,9 +1,9 @@ #ifndef RVL_SDK_WUD_H #define RVL_SDK_WUD_H -#include +#include "revolution/types.h" -#include -#include +#include "revolution/BTE.h" +#include "revolution/SC.h" #ifdef __cplusplus extern "C" { #endif diff --git a/libs/Runtime/include/NMWException.h b/libs/Runtime/include/NMWException.h index f4141ff98..dd3c1b568 100644 --- a/libs/Runtime/include/NMWException.h +++ b/libs/Runtime/include/NMWException.h @@ -1,7 +1,7 @@ #pragma once #include -#include <__ppc_eabi_linker.h> +#include "__ppc_eabi_linker.h" #include typedef void* ctor_dtor_ptr; diff --git a/libs/nw4r/include/nw4r/lyt/material.h b/libs/nw4r/include/nw4r/lyt/material.h index 6aa1e10d1..2ad2d9ad6 100644 --- a/libs/nw4r/include/nw4r/lyt/material.h +++ b/libs/nw4r/include/nw4r/lyt/material.h @@ -4,7 +4,7 @@ #include "nw4r/lyt/texMap.h" #include "nw4r/lyt/types.h" #include "nw4r/ut/Color.h" -#include "revolution/vi.h" +#include namespace nw4r { namespace lyt { diff --git a/libs/nw4r/include/nw4r/lyt/texMap.h b/libs/nw4r/include/nw4r/lyt/texMap.h index 2ca6d97ca..c6dfdb423 100644 --- a/libs/nw4r/include/nw4r/lyt/texMap.h +++ b/libs/nw4r/include/nw4r/lyt/texMap.h @@ -1,7 +1,7 @@ #pragma once #include "nw4r/lyt/types.h" -#include "revolution/tpl.h" +#include #include namespace nw4r { diff --git a/libs/nw4r/include/nw4r/math/triangular.h b/libs/nw4r/include/nw4r/math/triangular.h index d457c54a0..46aad5cf8 100644 --- a/libs/nw4r/include/nw4r/math/triangular.h +++ b/libs/nw4r/include/nw4r/math/triangular.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "nw4r/math/arithmetic.h" +#include "nw4r/math/constant.h" #include #define NW4R_MATH_IDX_TO_FIDX(x) ((x) * (1.0f / 256.0f)) diff --git a/src/Game/Animation/XanimePlayer.cpp b/src/Game/Animation/XanimePlayer.cpp index 8e10e063a..9de8bd019 100644 --- a/src/Game/Animation/XanimePlayer.cpp +++ b/src/Game/Animation/XanimePlayer.cpp @@ -1,11 +1,11 @@ #include "Game/Animation/XanimePlayer.hpp" #include "Game/Animation/XanimeCore.hpp" #include "Game/Animation/XanimeResource.hpp" -#include "JSystem/J3DGraphAnimator/J3DAnimation.hpp" -#include "JSystem/J3DGraphAnimator/J3DJoint.hpp" -#include "JSystem/J3DGraphAnimator/J3DModel.hpp" -#include "JSystem/J3DGraphAnimator/J3DMtxCalc.hpp" -#include "revolution/types.h" +#include +#include +#include +#include +#include namespace { const char* dummy_name = "NULL"; diff --git a/src/Game/Animation/XanimeResource.cpp b/src/Game/Animation/XanimeResource.cpp index 5543dd9f1..a32f9db01 100644 --- a/src/Game/Animation/XanimeResource.cpp +++ b/src/Game/Animation/XanimeResource.cpp @@ -3,7 +3,7 @@ #include "Game/System/ResourceInfo.hpp" #include "Game/Util/HashUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "revolution/types.h" +#include #include static bool unknownByte; diff --git a/src/Game/AreaObj/CollisionArea.cpp b/src/Game/AreaObj/CollisionArea.cpp index ba6f722c9..731c2ab61 100644 --- a/src/Game/AreaObj/CollisionArea.cpp +++ b/src/Game/AreaObj/CollisionArea.cpp @@ -8,7 +8,7 @@ #include "Game/Util/MtxUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include void CollisionArea_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/AreaObj/CubeCamera.cpp b/src/Game/AreaObj/CubeCamera.cpp index 899207e14..3376f317b 100644 --- a/src/Game/AreaObj/CubeCamera.cpp +++ b/src/Game/AreaObj/CubeCamera.cpp @@ -2,7 +2,7 @@ #include "Game/AreaObj/AreaObj.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SceneUtil.hpp" -#include "revolution/types.h" +#include #include diff --git a/src/Game/AudioLib/AudRemixMgr.cpp b/src/Game/AudioLib/AudRemixMgr.cpp index 6413de0ee..a408f9824 100644 --- a/src/Game/AudioLib/AudRemixMgr.cpp +++ b/src/Game/AudioLib/AudRemixMgr.cpp @@ -1,5 +1,5 @@ #include "Game/AudioLib/AudRemixMgr.hpp" -#include "JSystem/JKernel/JKRHeap.hpp" +#include AudRemixMgr::AudRemixMgr(JKRHeap* pHeap) { mHeap = pHeap; diff --git a/src/Game/AudioLib/AudTrackController.cpp b/src/Game/AudioLib/AudTrackController.cpp index 54e2274c2..38bb44803 100644 --- a/src/Game/AudioLib/AudTrackController.cpp +++ b/src/Game/AudioLib/AudTrackController.cpp @@ -1,9 +1,9 @@ #include "Game/AudioLib/AudTrackController.hpp" -#include "JSystem/JAudio2/JAISound.hpp" -#include "JSystem/JAudio2/JAISoundChild.hpp" -#include "JSystem/JAudio2/JAISoundParams.hpp" -#include "JSystem/JAudio2/JASCriticalSection.hpp" -#include "JSystem/JAudio2/JASTrack.hpp" +#include +#include +#include +#include +#include AudTrackController::AudTrackController() : mTrackNo(-1), mHandle(nullptr), mAutoMute(false), mVolume(1.0f) { } diff --git a/src/Game/AudioLib/CSSoundNameConverter.cpp b/src/Game/AudioLib/CSSoundNameConverter.cpp index 655bbbea3..a3dacce7b 100644 --- a/src/Game/AudioLib/CSSoundNameConverter.cpp +++ b/src/Game/AudioLib/CSSoundNameConverter.cpp @@ -1,7 +1,7 @@ #include "Game/AudioLib/CSSoundNameConverter.hpp" #include "Game/Speaker/SpkSystem.hpp" #include "Game/Speaker/SpkTable.hpp" -#include "JSystem/JAudio2/JASGlobal.hpp" +#include #include #include diff --git a/src/Game/Boss/BossStinkBug.cpp b/src/Game/Boss/BossStinkBug.cpp index e36b67fa2..30abb010c 100644 --- a/src/Game/Boss/BossStinkBug.cpp +++ b/src/Game/Boss/BossStinkBug.cpp @@ -24,10 +24,10 @@ #include "Game/Util/MtxUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JMath/JMath.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include +#include +#include void BossStinkBug_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Boss/BossStinkBugActionBase.cpp b/src/Game/Boss/BossStinkBugActionBase.cpp index 0c20ec41b..175353b5a 100644 --- a/src/Game/Boss/BossStinkBugActionBase.cpp +++ b/src/Game/Boss/BossStinkBugActionBase.cpp @@ -12,9 +12,9 @@ #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/SpringValue.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include +#include BossStinkBugActionBase::BossStinkBugActionBase(const char* pName, BossStinkBug* pStinkBug) : ActorStateBase< BossStinkBug >(pName, pStinkBug), mSpringValue(nullptr), _14(0.0f, 0.0f, 0.0f), _20(0.0f, 0.0f, 1.0f), _38(15.0f), _3C(0.0f), diff --git a/src/Game/Boss/BossStinkBugActionFlyLow.cpp b/src/Game/Boss/BossStinkBugActionFlyLow.cpp index 01efb868d..c2c9de69e 100644 --- a/src/Game/Boss/BossStinkBugActionFlyLow.cpp +++ b/src/Game/Boss/BossStinkBugActionFlyLow.cpp @@ -11,8 +11,8 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "revolution/types.h" +#include +#include namespace NrvBossStinkBugActionFlyLow { NEW_NERVE(BossStinkBugActionFlyLowNrvFly, BossStinkBugActionFlyLow, Fly); diff --git a/src/Game/Boss/BossStinkBugFunction.cpp b/src/Game/Boss/BossStinkBugFunction.cpp index 182c4b9bb..4eb55958a 100644 --- a/src/Game/Boss/BossStinkBugFunction.cpp +++ b/src/Game/Boss/BossStinkBugFunction.cpp @@ -5,8 +5,8 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/RailUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "JSystem/JMath/JMath.hpp" +#include +#include void BossStinkBugFunction_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Boss/BossStinkBugOpeningDemo.cpp b/src/Game/Boss/BossStinkBugOpeningDemo.cpp index 613edd9f8..f112aa87c 100644 --- a/src/Game/Boss/BossStinkBugOpeningDemo.cpp +++ b/src/Game/Boss/BossStinkBugOpeningDemo.cpp @@ -10,7 +10,7 @@ #include "Game/Util/NerveUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "revolution/types.h" +#include namespace NrvBossStinkBugOpeningDemo { NEW_NERVE(BossStinkBugOpeningDemoNrvTryStart, BossStinkBugOpeningDemo, TryStart); diff --git a/src/Game/Boss/DinoPackunBattleEgg.cpp b/src/Game/Boss/DinoPackunBattleEgg.cpp index 185c4fe95..707e40428 100644 --- a/src/Game/Boss/DinoPackunBattleEgg.cpp +++ b/src/Game/Boss/DinoPackunBattleEgg.cpp @@ -5,7 +5,7 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" #include "Game/Util/PlayerUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include namespace { static TVec3f sEggOutPosition = TVec3f(0.0f, 60.0f, -320.0f); diff --git a/src/Game/Boss/DinoPackunTailPart.cpp b/src/Game/Boss/DinoPackunTailPart.cpp index eadc4ef81..921de2ec1 100644 --- a/src/Game/Boss/DinoPackunTailPart.cpp +++ b/src/Game/Boss/DinoPackunTailPart.cpp @@ -7,7 +7,7 @@ #include "Game/Util/JointController.hpp" #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/ObjUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace NrvDinoPackunTailPart { NEW_NERVE(DinoPackunTailPartNrvWait, DinoPackunTailPart, Wait); diff --git a/src/Game/Boss/KoopaFireStairs.cpp b/src/Game/Boss/KoopaFireStairs.cpp index 71bdd4791..6317386fd 100644 --- a/src/Game/Boss/KoopaFireStairs.cpp +++ b/src/Game/Boss/KoopaFireStairs.cpp @@ -10,7 +10,7 @@ #include "Game/Util/MtxUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include namespace { // static const f32 sFlyUpHeight = _; diff --git a/src/Game/Boss/PoltaFunction.cpp b/src/Game/Boss/PoltaFunction.cpp index 4707478cb..11fc79c0c 100644 --- a/src/Game/Boss/PoltaFunction.cpp +++ b/src/Game/Boss/PoltaFunction.cpp @@ -13,7 +13,7 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace PoltaFunction { void onMovement(Polta* pPolta) { diff --git a/src/Game/Boss/PoltaSensorCtrl.cpp b/src/Game/Boss/PoltaSensorCtrl.cpp index 31c518bf6..1618a9d39 100644 --- a/src/Game/Boss/PoltaSensorCtrl.cpp +++ b/src/Game/Boss/PoltaSensorCtrl.cpp @@ -4,8 +4,8 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/Util/ActorSensorUtil.hpp" #include "Game/Util/JointUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include #include namespace { diff --git a/src/Game/Boss/PoltaStateStagger.cpp b/src/Game/Boss/PoltaStateStagger.cpp index bcffe6770..af68f6e5e 100644 --- a/src/Game/Boss/PoltaStateStagger.cpp +++ b/src/Game/Boss/PoltaStateStagger.cpp @@ -8,7 +8,7 @@ #include "Game/Util/NerveUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include namespace NrvPoltaStateStagger { NEW_NERVE(PoltaStateStaggerNrvWait, PoltaStateStagger, Wait); diff --git a/src/Game/Boss/SkeletalFishBaby.cpp b/src/Game/Boss/SkeletalFishBaby.cpp index 9d267e9d5..f87b91f32 100644 --- a/src/Game/Boss/SkeletalFishBaby.cpp +++ b/src/Game/Boss/SkeletalFishBaby.cpp @@ -17,7 +17,7 @@ #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DJoint.hpp" +#include #include void SkeletalFishBaby_FORCE_MATCH_SDATA2() { diff --git a/src/Game/Boss/SkeletalFishBoss.cpp b/src/Game/Boss/SkeletalFishBoss.cpp index 6a88f1bdf..bf34626d1 100644 --- a/src/Game/Boss/SkeletalFishBoss.cpp +++ b/src/Game/Boss/SkeletalFishBoss.cpp @@ -35,7 +35,7 @@ #include "Game/Util/SceneUtil.hpp" #include "Game/Util/ScreenUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DJoint.hpp" +#include #include #include #include diff --git a/src/Game/Boss/TripodBoss.cpp b/src/Game/Boss/TripodBoss.cpp index c4e1ec3b3..be646e2da 100644 --- a/src/Game/Boss/TripodBoss.cpp +++ b/src/Game/Boss/TripodBoss.cpp @@ -24,8 +24,8 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "JSystem/JMath/JMath.hpp" +#include +#include #include namespace { diff --git a/src/Game/Boss/TripodBossGuardWall.cpp b/src/Game/Boss/TripodBossGuardWall.cpp index 80374fe4b..d4980da82 100644 --- a/src/Game/Boss/TripodBossGuardWall.cpp +++ b/src/Game/Boss/TripodBossGuardWall.cpp @@ -15,7 +15,7 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace { struct WallPartPlacementAngle { diff --git a/src/Game/Boss/TripodBossMovableArea.cpp b/src/Game/Boss/TripodBossMovableArea.cpp index 8fcbb49df..c7191bf47 100644 --- a/src/Game/Boss/TripodBossMovableArea.cpp +++ b/src/Game/Boss/TripodBossMovableArea.cpp @@ -1,6 +1,6 @@ #include "Game/Boss/TripodBossMovableArea.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include namespace { // unused diff --git a/src/Game/Camera/CamKarikariEffector.cpp b/src/Game/Camera/CamKarikariEffector.cpp index 6230768bf..6d0e56b8b 100644 --- a/src/Game/Camera/CamKarikariEffector.cpp +++ b/src/Game/Camera/CamKarikariEffector.cpp @@ -4,7 +4,7 @@ #include "Game/Enemy/KarikariDirector.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/PlayerUtil.hpp" -#include "JSystem/JGeometry/TUtil.hpp" +#include namespace { static const f32 sKarikariViewRate = 0.8f; diff --git a/src/Game/Camera/CameraBlackHole.cpp b/src/Game/Camera/CameraBlackHole.cpp index 8eec456de..8f9f5086e 100644 --- a/src/Game/Camera/CameraBlackHole.cpp +++ b/src/Game/Camera/CameraBlackHole.cpp @@ -2,7 +2,7 @@ #include "Game/Camera/CamTranslatorBlackHole.hpp" #include "Game/Camera/CameraLocalUtil.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JGeometry/TUtil.hpp" +#include #include void CameraBlackHole_FORCE_MATCH_SDATA2() { diff --git a/src/Game/Camera/CameraCalc.cpp b/src/Game/Camera/CameraCalc.cpp index 42b424035..30e8787e4 100644 --- a/src/Game/Camera/CameraCalc.cpp +++ b/src/Game/Camera/CameraCalc.cpp @@ -1,6 +1,6 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/VectorUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include #include void CameraCalc_FORCE_MATCH_SDATA2() { diff --git a/src/Game/Camera/CameraCubePlanet.cpp b/src/Game/Camera/CameraCubePlanet.cpp index dcf7844a3..2d456cb77 100644 --- a/src/Game/Camera/CameraCubePlanet.cpp +++ b/src/Game/Camera/CameraCubePlanet.cpp @@ -3,7 +3,7 @@ #include "Game/Camera/CameraLocalUtil.hpp" #include "Game/Camera/CameraTargetObj.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JGeometry/TUtil.hpp" +#include void CameraCubePlanet_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Camera/CameraDPD.cpp b/src/Game/Camera/CameraDPD.cpp index 02e291e43..d876c07a1 100644 --- a/src/Game/Camera/CameraDPD.cpp +++ b/src/Game/Camera/CameraDPD.cpp @@ -5,7 +5,7 @@ #include "Game/Util/GamePadUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "revolution/wpad.h" +#include void CameraDPD_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Camera/CameraLocalUtil.cpp b/src/Game/Camera/CameraLocalUtil.cpp index 5ea301c16..0424d8103 100644 --- a/src/Game/Camera/CameraLocalUtil.cpp +++ b/src/Game/Camera/CameraLocalUtil.cpp @@ -9,7 +9,7 @@ #include "Game/Util/DemoUtil.hpp" #include "Game/Util/GamePadUtil.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include void CameraLocalUtil_FORCE_SDATA2() { (void)1.0f; diff --git a/src/Game/Camera/CameraMedianPlanet.cpp b/src/Game/Camera/CameraMedianPlanet.cpp index de095d217..1da2ea657 100644 --- a/src/Game/Camera/CameraMedianPlanet.cpp +++ b/src/Game/Camera/CameraMedianPlanet.cpp @@ -6,7 +6,7 @@ #include "Game/Util/CameraUtil.hpp" #include "Game/Util/GravityUtil.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JGeometry/TUtil.hpp" +#include void CameraMedianPlanet_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Camera/CameraParamChunkHolder.cpp b/src/Game/Camera/CameraParamChunkHolder.cpp index 46ebfe153..e8ad75943 100644 --- a/src/Game/Camera/CameraParamChunkHolder.cpp +++ b/src/Game/Camera/CameraParamChunkHolder.cpp @@ -6,7 +6,7 @@ #include "Game/Camera/DotCamParams.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/SceneUtil.hpp" -#include "JSystem/JKernel/JKRHeap.hpp" +#include #include #define CHUNK_CAPACITY 0x400 diff --git a/src/Game/Camera/CameraShaker.cpp b/src/Game/Camera/CameraShaker.cpp index 077a4818a..b852b80ba 100644 --- a/src/Game/Camera/CameraShaker.cpp +++ b/src/Game/Camera/CameraShaker.cpp @@ -3,7 +3,7 @@ #include "Game/Camera/CameraShakeTask.hpp" #include "Game/Util/CameraUtil.hpp" #include "Game/Util/ScreenUtil.hpp" -#include "JSystem/JUtility/JUTVideo.hpp" +#include namespace { static const f32 sInfinityIntensity = 1.0f; diff --git a/src/Game/Demo/DemoStartRequestHolder.cpp b/src/Game/Demo/DemoStartRequestHolder.cpp index cb01ff1fb..830a31eaf 100644 --- a/src/Game/Demo/DemoStartRequestHolder.cpp +++ b/src/Game/Demo/DemoStartRequestHolder.cpp @@ -2,7 +2,7 @@ #include "Game/Demo/DemoStartRequestUtil.hpp" #include "Game/NameObj/NameObj.hpp" #include "Game/Util/StringUtil.hpp" -#include "revolution/types.h" +#include DemoStartInfo::DemoStartInfo() { _0 = nullptr; diff --git a/src/Game/Effect/AstroEffectObj.cpp b/src/Game/Effect/AstroEffectObj.cpp index a01375dfd..a1df16ebd 100644 --- a/src/Game/Effect/AstroEffectObj.cpp +++ b/src/Game/Effect/AstroEffectObj.cpp @@ -2,8 +2,8 @@ #include "Game/Effect/SimpleEffectObj.hpp" #include "Game/MapObj/AstroMapObjFunction.hpp" #include "Game/Util/DemoUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/mtx.h" +#include +#include AstroEffectObj::AstroEffectObj(const char* pName) : SimpleEffectObj(pName) { _9C = -1; diff --git a/src/Game/Effect/EffectSystem.cpp b/src/Game/Effect/EffectSystem.cpp index 931ab2fc3..d9eb3b412 100644 --- a/src/Game/Effect/EffectSystem.cpp +++ b/src/Game/Effect/EffectSystem.cpp @@ -11,7 +11,7 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Util/MemoryUtil.hpp" #include "Game/Util/ScreenUtil.hpp" -#include "JSystem/JParticle/JPAParticle.hpp" +#include #include #include diff --git a/src/Game/Effect/ParticleCalcExecutor.cpp b/src/Game/Effect/ParticleCalcExecutor.cpp index 4c6d15f57..60d4c8a38 100644 --- a/src/Game/Effect/ParticleCalcExecutor.cpp +++ b/src/Game/Effect/ParticleCalcExecutor.cpp @@ -5,7 +5,7 @@ #include "Game/Scene/SceneFunction.hpp" #include "Game/Util/Functor.hpp" #include "Game/Util/ObjUtil.hpp" -#include "JSystem/JParticle/JPAEmitterManager.hpp" +#include namespace { void connectToSceneCalcAnimAdaptor(NameObjAdaptor* pAdaptor, const MR::FunctorBase& rFunctor, int calcAnimType) { diff --git a/src/Game/Effect/ParticleResourceHolder.cpp b/src/Game/Effect/ParticleResourceHolder.cpp index 33b770c0d..73f5878b4 100644 --- a/src/Game/Effect/ParticleResourceHolder.cpp +++ b/src/Game/Effect/ParticleResourceHolder.cpp @@ -3,8 +3,8 @@ #include "Game/Util/JMapInfo.hpp" #include "Game/Util/MemoryUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JKernel/JKRMemArchive.hpp" -#include "JSystem/JParticle/JPAResourceManager.hpp" +#include +#include #include ParticleResourceHolder::ParticleResourceHolder(const char* pArchiveName) diff --git a/src/Game/Effect/SpinPullParticleCallBack.cpp b/src/Game/Effect/SpinPullParticleCallBack.cpp index cd5a640ac..4c9268e2d 100644 --- a/src/Game/Effect/SpinPullParticleCallBack.cpp +++ b/src/Game/Effect/SpinPullParticleCallBack.cpp @@ -1,8 +1,8 @@ #include "Game/Effect/SpinPullParticleCallBack.hpp" #include "Game/Util/PlayerUtil.hpp" -#include "JSystem/JParticle/JPAEmitter.hpp" -#include "JSystem/JParticle/JPAParticle.hpp" +#include +#include SpinPullParticleCallBack::SpinPullParticleCallBack() : MultiEmitterParticleCallBack() { _4 = 1.0f; diff --git a/src/Game/Enemy/AnimStampController.cpp b/src/Game/Enemy/AnimStampController.cpp index d9876eadf..b74e8b936 100644 --- a/src/Game/Enemy/AnimStampController.cpp +++ b/src/Game/Enemy/AnimStampController.cpp @@ -4,8 +4,8 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/MtxUtil.hpp" #include "Game/Util/NerveUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include void dummy() { // to emit TVec3f init diff --git a/src/Game/Enemy/BasaBasa.cpp b/src/Game/Enemy/BasaBasa.cpp index 2f70ca741..227912941 100644 --- a/src/Game/Enemy/BasaBasa.cpp +++ b/src/Game/Enemy/BasaBasa.cpp @@ -21,7 +21,7 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "revolution/mtx.h" +#include namespace NrvBasaBasa { NEW_NERVE(BasaBasaNrvWait, BasaBasa, Wait); diff --git a/src/Game/Enemy/BegomanBaby.cpp b/src/Game/Enemy/BegomanBaby.cpp index 168a21e38..80ca7c032 100644 --- a/src/Game/Enemy/BegomanBaby.cpp +++ b/src/Game/Enemy/BegomanBaby.cpp @@ -12,7 +12,7 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include namespace NrvBegomanBaby { NEW_NERVE_ONEND(HostTypeNrvNoCalcWait, BegomanBaby, NoCalcWait, NoCalcWait); diff --git a/src/Game/Enemy/BegomanBase.cpp b/src/Game/Enemy/BegomanBase.cpp index 4ed7c67de..4a31db340 100644 --- a/src/Game/Enemy/BegomanBase.cpp +++ b/src/Game/Enemy/BegomanBase.cpp @@ -25,7 +25,7 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include namespace { const MR::ActorMoveParam hReturnWaitParam = {0.0f, 1.0f, 0.95f, 0.0f}; diff --git a/src/Game/Enemy/BegomanFunction.cpp b/src/Game/Enemy/BegomanFunction.cpp index 380636db2..2d0d64082 100644 --- a/src/Game/Enemy/BegomanFunction.cpp +++ b/src/Game/Enemy/BegomanFunction.cpp @@ -1,4 +1,4 @@ -#include "JSystem/JGeometry/TVec.hpp" +#include void dummy(const TQuat4f& rRotation, TVec3f& rVector) { void (TQuat4f::*rotate)(TVec3f&) const = &TQuat4f::rotate; diff --git a/src/Game/Enemy/BegomanSpring.cpp b/src/Game/Enemy/BegomanSpring.cpp index 0d645809b..48236b1aa 100644 --- a/src/Game/Enemy/BegomanSpring.cpp +++ b/src/Game/Enemy/BegomanSpring.cpp @@ -24,7 +24,7 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include namespace NrvBegomanSpring { NEW_NERVE_ONEND(HostTypeNrvNoCalcWait, BegomanSpring, NoCalcWait, NoCalcWait); diff --git a/src/Game/Enemy/BombTeresa.cpp b/src/Game/Enemy/BombTeresa.cpp index 4ffe059fa..3a8cee022 100644 --- a/src/Game/Enemy/BombTeresa.cpp +++ b/src/Game/Enemy/BombTeresa.cpp @@ -25,10 +25,10 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JMath/JMath.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include +#include +#include namespace NrvBombTeresa { NEW_NERVE(BombTeresaNrvAppear, BombTeresa, Appear); diff --git a/src/Game/Enemy/EyeBeamer.cpp b/src/Game/Enemy/EyeBeamer.cpp index d5417e69c..2c183fce9 100644 --- a/src/Game/Enemy/EyeBeamer.cpp +++ b/src/Game/Enemy/EyeBeamer.cpp @@ -22,9 +22,9 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TQuat.hpp" -#include "revolution/mtx.h" +#include +#include +#include namespace NrvEyeBeamer { NEW_NERVE(EyeBeamerNrvDemoStartWait, EyeBeamer, DemoStartWait); diff --git a/src/Game/Enemy/HammerHeadPackun.cpp b/src/Game/Enemy/HammerHeadPackun.cpp index 094dc8236..ea3bc17de 100644 --- a/src/Game/Enemy/HammerHeadPackun.cpp +++ b/src/Game/Enemy/HammerHeadPackun.cpp @@ -18,12 +18,12 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "JSystem/JMath/JMath.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include +#include +#include +#include +#include void HammerHeadPackun_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/Jiraira.cpp b/src/Game/Enemy/Jiraira.cpp index b4c965376..3e9dd8a91 100644 --- a/src/Game/Enemy/Jiraira.cpp +++ b/src/Game/Enemy/Jiraira.cpp @@ -12,7 +12,7 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "revolution/types.h" +#include void Jiraira_FORCE_MATCH_SDATA2() { (void)0.0f; diff --git a/src/Game/Enemy/JumpSpider.cpp b/src/Game/Enemy/JumpSpider.cpp index 33b10119f..0d3f0b8a6 100644 --- a/src/Game/Enemy/JumpSpider.cpp +++ b/src/Game/Enemy/JumpSpider.cpp @@ -17,9 +17,9 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include +#include void JumpSpider_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/Kanina.cpp b/src/Game/Enemy/Kanina.cpp index 9c6ea7977..27db1ffaa 100644 --- a/src/Game/Enemy/Kanina.cpp +++ b/src/Game/Enemy/Kanina.cpp @@ -4,7 +4,7 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" #include "Game/Util/JointRumbler.hpp" -#include "revolution/wpad.h" +#include namespace NrvKanina { NEW_NERVE(HostTypeAppear, Kanina, Appear); diff --git a/src/Game/Enemy/Karikari.cpp b/src/Game/Enemy/Karikari.cpp index f0413421b..c0d33e678 100644 --- a/src/Game/Enemy/Karikari.cpp +++ b/src/Game/Enemy/Karikari.cpp @@ -17,7 +17,7 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TUtil.hpp" +#include void Karikari_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/Karon.cpp b/src/Game/Enemy/Karon.cpp index d01a85897..976147e06 100644 --- a/src/Game/Enemy/Karon.cpp +++ b/src/Game/Enemy/Karon.cpp @@ -19,8 +19,8 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include void Karon_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/Kuribo.cpp b/src/Game/Enemy/Kuribo.cpp index ae2dfff49..ff59b4b8f 100644 --- a/src/Game/Enemy/Kuribo.cpp +++ b/src/Game/Enemy/Kuribo.cpp @@ -25,7 +25,7 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" #include "Game/Util/VectorUtil.hpp" -#include "revolution/mtx.h" +#include void Kuribo_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/KuriboChief.cpp b/src/Game/Enemy/KuriboChief.cpp index 9dc05c632..d8556f38f 100644 --- a/src/Game/Enemy/KuriboChief.cpp +++ b/src/Game/Enemy/KuriboChief.cpp @@ -30,9 +30,9 @@ #include "Game/Util/SceneUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/os.h" -#include "revolution/types.h" +#include +#include +#include void KuriboChief_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/KuriboMini.cpp b/src/Game/Enemy/KuriboMini.cpp index b08e48769..933a13895 100644 --- a/src/Game/Enemy/KuriboMini.cpp +++ b/src/Game/Enemy/KuriboMini.cpp @@ -24,8 +24,8 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include void KuriboMini_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/MechanicKoopaMini.cpp b/src/Game/Enemy/MechanicKoopaMini.cpp index e656adbc1..16dc7a883 100644 --- a/src/Game/Enemy/MechanicKoopaMini.cpp +++ b/src/Game/Enemy/MechanicKoopaMini.cpp @@ -22,8 +22,8 @@ #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include void MechanicKoopaMini_FORCE_MATCH_SDATA2() { (void)0.0f; diff --git a/src/Game/Enemy/Metbo.cpp b/src/Game/Enemy/Metbo.cpp index a88fc6a05..00fa26b36 100644 --- a/src/Game/Enemy/Metbo.cpp +++ b/src/Game/Enemy/Metbo.cpp @@ -22,10 +22,10 @@ #include "Game/Util/SceneUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "JSystem/JMath/JMath.hpp" -#include "revolution/types.h" +#include +#include +#include +#include void Metbo_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/Mogu.cpp b/src/Game/Enemy/Mogu.cpp index 090852ebb..4e44fb4b0 100644 --- a/src/Game/Enemy/Mogu.cpp +++ b/src/Game/Enemy/Mogu.cpp @@ -19,8 +19,8 @@ #include "Game/Util/SceneUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JMath/JMath.hpp" -#include +#include +#include "math_types.hpp" namespace { const f32 hThrowableSightParam[] = {900.0f, 10.0f, 90.0f}; diff --git a/src/Game/Enemy/MoguStone.cpp b/src/Game/Enemy/MoguStone.cpp index 85bdd5ab0..0e6cc6d1c 100644 --- a/src/Game/Enemy/MoguStone.cpp +++ b/src/Game/Enemy/MoguStone.cpp @@ -11,8 +11,8 @@ #include "Game/Util/ParabolicPath.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "revolution/mtx.h" +#include +#include namespace { const static f32 hAddHeight = 200.0f; diff --git a/src/Game/Enemy/Pukupuku.cpp b/src/Game/Enemy/Pukupuku.cpp index 38eda3339..092ea37ec 100644 --- a/src/Game/Enemy/Pukupuku.cpp +++ b/src/Game/Enemy/Pukupuku.cpp @@ -20,7 +20,7 @@ #include "Game/Util/StarPointerUtil.hpp" #include "Game/Util/StringUtil.hpp" #include "Game/Util/ValueControl.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace { NEW_NERVE(PukupukuStateLandingLandingMoveLand, PukupukuStateLanding, LandingMoveLand); diff --git a/src/Game/Enemy/RingBeam.cpp b/src/Game/Enemy/RingBeam.cpp index 2385e06e0..971f8145d 100644 --- a/src/Game/Enemy/RingBeam.cpp +++ b/src/Game/Enemy/RingBeam.cpp @@ -15,7 +15,7 @@ #include "Game/Util/MtxUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TUtil.hpp" +#include void RingBeam_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/SamboHead.cpp b/src/Game/Enemy/SamboHead.cpp index 894e648f2..8ba01e433 100644 --- a/src/Game/Enemy/SamboHead.cpp +++ b/src/Game/Enemy/SamboHead.cpp @@ -5,7 +5,7 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include namespace NrvSamboHead { NEW_NERVE(HostTypeNrvWaitUnderGround, SamboHead, WaitUnderGround); diff --git a/src/Game/Enemy/Snakehead.cpp b/src/Game/Enemy/Snakehead.cpp index c0d787658..57d79c9f3 100644 --- a/src/Game/Enemy/Snakehead.cpp +++ b/src/Game/Enemy/Snakehead.cpp @@ -14,7 +14,7 @@ #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace { struct SnakeheadData { diff --git a/src/Game/Enemy/StinkBugBase.cpp b/src/Game/Enemy/StinkBugBase.cpp index 1412a7832..389af0506 100644 --- a/src/Game/Enemy/StinkBugBase.cpp +++ b/src/Game/Enemy/StinkBugBase.cpp @@ -9,8 +9,8 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "JSystem/JMath/JMath.hpp" +#include +#include StinkBugBase::StinkBugBase(const char* pName) : LiveActor(pName), _8C(0.0f, 0.0f, 1.0f), _98(0.0f, 0.0f, 0.0f), _A4(0.0f, 0.0f, 1.0f), _B0(180.0f), mRadius(1000.0f), _B8(false) { diff --git a/src/Game/Enemy/StinkBugParent.cpp b/src/Game/Enemy/StinkBugParent.cpp index bd91bb747..e8236f2cb 100644 --- a/src/Game/Enemy/StinkBugParent.cpp +++ b/src/Game/Enemy/StinkBugParent.cpp @@ -12,9 +12,9 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include +#include void StinkBugParent_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/StringSpider.cpp b/src/Game/Enemy/StringSpider.cpp index 1e61405fc..cf92ed8a4 100644 --- a/src/Game/Enemy/StringSpider.cpp +++ b/src/Game/Enemy/StringSpider.cpp @@ -23,10 +23,10 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include +#include +#include void StringSpider_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Enemy/Takobo.cpp b/src/Game/Enemy/Takobo.cpp index d029dcf9e..55c57fdd8 100644 --- a/src/Game/Enemy/Takobo.cpp +++ b/src/Game/Enemy/Takobo.cpp @@ -18,7 +18,7 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace NrvTakobo { NEW_NERVE_ONEND(HostTypeNrvWait, Takobo, Wait, Wait); diff --git a/src/Game/Enemy/TerritoryMover.cpp b/src/Game/Enemy/TerritoryMover.cpp index c7c2147c8..5ac5ed93f 100644 --- a/src/Game/Enemy/TerritoryMover.cpp +++ b/src/Game/Enemy/TerritoryMover.cpp @@ -1,7 +1,7 @@ #include "Game/Enemy/TerritoryMover.hpp" #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include TerritoryMover::TerritoryMover(f32 radius) { mRadius = radius; diff --git a/src/Game/Enemy/WaterBazooka.cpp b/src/Game/Enemy/WaterBazooka.cpp index 7a125336c..f8ac34800 100644 --- a/src/Game/Enemy/WaterBazooka.cpp +++ b/src/Game/Enemy/WaterBazooka.cpp @@ -31,7 +31,7 @@ #include "Game/Util/StringUtil.hpp" #include #include -#include +#include "math_types.hpp" #include void WaterBazooka_FORCE_MATCH_SDATA2() { diff --git a/src/Game/Gravity/CubeGravity.cpp b/src/Game/Gravity/CubeGravity.cpp index 191b03d1c..f203a1b9b 100644 --- a/src/Game/Gravity/CubeGravity.cpp +++ b/src/Game/Gravity/CubeGravity.cpp @@ -1,6 +1,6 @@ #include "Game/Gravity.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include #define REGION_NEGATIVE_X 0 #define REGION_BETWEEN_X 1 diff --git a/src/Game/Gravity/DiskGravity.cpp b/src/Game/Gravity/DiskGravity.cpp index f2e79dab2..b8ab3d08d 100644 --- a/src/Game/Gravity/DiskGravity.cpp +++ b/src/Game/Gravity/DiskGravity.cpp @@ -2,7 +2,7 @@ #include "Game/Util.hpp" #include "Inline.hpp" #include -#include +#include "math_types.hpp" void DiskGravity_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/Gravity/ParallelGravity.cpp b/src/Game/Gravity/ParallelGravity.cpp index 4a215c080..3bf4b258d 100644 --- a/src/Game/Gravity/ParallelGravity.cpp +++ b/src/Game/Gravity/ParallelGravity.cpp @@ -1,7 +1,7 @@ #include "Game/Gravity.hpp" #include "Game/Util.hpp" #include "Inline.hpp" -#include "JSystem/JMath.hpp" +#include void ParallelGravity_FORCE_MATCH(const TVec3f& rVector) { TVec3f negated = -rVector; diff --git a/src/Game/Gravity/SegmentGravity.cpp b/src/Game/Gravity/SegmentGravity.cpp index d8461ae7c..2d6f06c9b 100644 --- a/src/Game/Gravity/SegmentGravity.cpp +++ b/src/Game/Gravity/SegmentGravity.cpp @@ -1,6 +1,6 @@ #include "Game/Gravity.hpp" #include "Game/Util.hpp" -#include "JSystem/JGeometry/TUtil.hpp" +#include #include void SegmentGravity_FORCE_MATCH_SDATA2() { diff --git a/src/Game/LiveActor/MirrorCamera.cpp b/src/Game/LiveActor/MirrorCamera.cpp index 55b7b6a46..d480e382b 100644 --- a/src/Game/LiveActor/MirrorCamera.cpp +++ b/src/Game/LiveActor/MirrorCamera.cpp @@ -3,8 +3,8 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Util.hpp" #include "Game/Util/MtxUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DModelData.hpp" -#include "JSystem/JGeometry/TPartition3.hpp" +#include +#include void MirrorCamera_FORCE_MATCH_SDATA2() { 1.0f; diff --git a/src/Game/LiveActor/ShadowSurfaceBox.cpp b/src/Game/LiveActor/ShadowSurfaceBox.cpp index 7e28d7e36..31309ad1d 100644 --- a/src/Game/LiveActor/ShadowSurfaceBox.cpp +++ b/src/Game/LiveActor/ShadowSurfaceBox.cpp @@ -3,12 +3,12 @@ #include "Game/LiveActor/ShadowController.hpp" #include "Game/LiveActor/ShadowSurfaceDrawer.hpp" #include "Game/Util/DirectDraw.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXGeometry.h" -#include "revolution/gx/GXVert.h" -#include "revolution/mtx.h" +#include +#include +#include +#include +#include +#include ShadowSurfaceBox::~ShadowSurfaceBox() { } diff --git a/src/Game/LiveActor/ShadowSurfaceCircle.cpp b/src/Game/LiveActor/ShadowSurfaceCircle.cpp index 6a660c62e..69a8e9c50 100644 --- a/src/Game/LiveActor/ShadowSurfaceCircle.cpp +++ b/src/Game/LiveActor/ShadowSurfaceCircle.cpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/LiveActor/ShadowController.hpp" #include "Game/Util/DirectDraw.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include ShadowSurfaceCircle::~ShadowSurfaceCircle() { } diff --git a/src/Game/LiveActor/ShadowSurfaceOval.cpp b/src/Game/LiveActor/ShadowSurfaceOval.cpp index 0aa72712b..42dcba8bb 100644 --- a/src/Game/LiveActor/ShadowSurfaceOval.cpp +++ b/src/Game/LiveActor/ShadowSurfaceOval.cpp @@ -7,10 +7,10 @@ #include "Game/Util/DrawUtil.hpp" #include "Game/Util/ModelUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXLighting.h" +#include +#include +#include +#include ShadowSurfaceOval::~ShadowSurfaceOval() { diff --git a/src/Game/LiveActor/ShadowVolumeCylinder.cpp b/src/Game/LiveActor/ShadowVolumeCylinder.cpp index a81691e80..02ede1634 100644 --- a/src/Game/LiveActor/ShadowVolumeCylinder.cpp +++ b/src/Game/LiveActor/ShadowVolumeCylinder.cpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/CameraUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "revolution/gx.h" +#include namespace { const f32 sModelScale = 100.0f; diff --git a/src/Game/LiveActor/ShadowVolumeFlatModel.cpp b/src/Game/LiveActor/ShadowVolumeFlatModel.cpp index ac9af5b31..3e1f2548b 100644 --- a/src/Game/LiveActor/ShadowVolumeFlatModel.cpp +++ b/src/Game/LiveActor/ShadowVolumeFlatModel.cpp @@ -3,8 +3,8 @@ #include "Game/Util/CameraUtil.hpp" #include "Game/Util/ModelUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DJoint.hpp" -#include "JSystem/J3DGraphAnimator/J3DModelData.hpp" +#include +#include ShadowVolumeFlatModel::ShadowVolumeFlatModel(const char* pModelName) : ShadowVolumeModel("板状シャドウボリューム描画"), mBaseMtx(), mRootDrawMtxIndex(-1), mDropDrawMtxIndex(-1) { diff --git a/src/Game/LiveActor/ShadowVolumeOval.cpp b/src/Game/LiveActor/ShadowVolumeOval.cpp index da6a30e3e..f208bbfee 100644 --- a/src/Game/LiveActor/ShadowVolumeOval.cpp +++ b/src/Game/LiveActor/ShadowVolumeOval.cpp @@ -3,7 +3,7 @@ #include "Game/Util/CameraUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include ShadowVolumeOval::ShadowVolumeOval() : ShadowVolumeModel("影描画[ボリューム楕球]"), mSize(100.0f, 100.0f, 200.0f) { initVolumeModel("ShadowVolumeSphere"); diff --git a/src/Game/LiveActor/ShadowVolumeOvalPole.cpp b/src/Game/LiveActor/ShadowVolumeOvalPole.cpp index 9794a9ca3..cb07a2e26 100644 --- a/src/Game/LiveActor/ShadowVolumeOvalPole.cpp +++ b/src/Game/LiveActor/ShadowVolumeOvalPole.cpp @@ -3,7 +3,7 @@ #include "Game/Util/CameraUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "revolution/gx.h" +#include namespace { const f32 sModelScale = 100.0f; diff --git a/src/Game/LiveActor/ShadowVolumeSphere.cpp b/src/Game/LiveActor/ShadowVolumeSphere.cpp index cc7526332..18810fbc7 100644 --- a/src/Game/LiveActor/ShadowVolumeSphere.cpp +++ b/src/Game/LiveActor/ShadowVolumeSphere.cpp @@ -1,7 +1,7 @@ #include "Game/LiveActor/ShadowVolumeSphere.hpp" #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/CameraUtil.hpp" -#include "revolution/gx.h" +#include namespace { const f32 sModelScale = 100.0f; diff --git a/src/Game/Map/BezierRail.cpp b/src/Game/Map/BezierRail.cpp index 63a49cf31..22de22d1e 100644 --- a/src/Game/Map/BezierRail.cpp +++ b/src/Game/Map/BezierRail.cpp @@ -4,7 +4,7 @@ #include "Game/Util/JMapUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include #include void BezierRail_FORCE_MATCH_SDATA2() { diff --git a/src/Game/Map/Flag.cpp b/src/Game/Map/Flag.cpp index 41b1b3bf3..2513eedfb 100644 --- a/src/Game/Map/Flag.cpp +++ b/src/Game/Map/Flag.cpp @@ -11,17 +11,17 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" -#include "revolution/gx/GXBump.h" -#include "revolution/gx/GXCull.h" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXGeometry.h" -#include "revolution/gx/GXLighting.h" -#include "revolution/gx/GXPixel.h" -#include "revolution/gx/GXTev.h" -#include "revolution/gx/GXTransform.h" -#include "revolution/gx/GXVert.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { static const f32 sDefaultPointIntervalU = 40.0f; diff --git a/src/Game/Map/LightFunction.cpp b/src/Game/Map/LightFunction.cpp index 5f5b3ae4b..c6ae5d029 100644 --- a/src/Game/Map/LightFunction.cpp +++ b/src/Game/Map/LightFunction.cpp @@ -6,7 +6,7 @@ #include "Game/Map/LightPointCtrl.hpp" #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Util.hpp" -#include "revolution/gx/GXEnum.h" +#include #include #include diff --git a/src/Game/Map/OceanBowl.cpp b/src/Game/Map/OceanBowl.cpp index 594d61695..0c60ed8f8 100644 --- a/src/Game/Map/OceanBowl.cpp +++ b/src/Game/Map/OceanBowl.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include "math_types.hpp" #include #include #include diff --git a/src/Game/Map/OceanRing.cpp b/src/Game/Map/OceanRing.cpp index 2d545088d..9f4f12208 100644 --- a/src/Game/Map/OceanRing.cpp +++ b/src/Game/Map/OceanRing.cpp @@ -16,9 +16,9 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "JSystem/JMath/JMath.hpp" -#include "revolution/mtx.h" +#include +#include +#include namespace { const f32 sPointIntervalLine = 200.0f; diff --git a/src/Game/Map/OceanSpherePoint.cpp b/src/Game/Map/OceanSpherePoint.cpp index d7f32153b..23e63aaec 100644 --- a/src/Game/Map/OceanSpherePoint.cpp +++ b/src/Game/Map/OceanSpherePoint.cpp @@ -1,6 +1,6 @@ #include "Game/Map/OceanSpherePoint.hpp" #include "Game/Util.hpp" -#include "revolution/mtx.h" +#include OceanSpherePoint::OceanSpherePoint(const TVec3f* pCenter, const TVec3f& rNormal, f32 wave1Pos, f32 wave2Pos, const TVec2f& rTexCoord) : mPos(*pCenter), mCenter(pCenter), mNormal(rNormal), mWave1Pos(wave1Pos), mWave2Pos(wave2Pos), mTexCoord(rTexCoord) { diff --git a/src/Game/Map/RailPart.cpp b/src/Game/Map/RailPart.cpp index dbd9772de..fafc46f10 100644 --- a/src/Game/Map/RailPart.cpp +++ b/src/Game/Map/RailPart.cpp @@ -1,6 +1,6 @@ #include "Game/Map/RailPart.hpp" #include "Game/Map/BezierRail.hpp" -#include "JSystem/JMath/JMath.hpp" +#include void DUMMY() { TVec3f a, b; diff --git a/src/Game/Map/WaterPlant.cpp b/src/Game/Map/WaterPlant.cpp index 69257d792..69769a357 100644 --- a/src/Game/Map/WaterPlant.cpp +++ b/src/Game/Map/WaterPlant.cpp @@ -3,9 +3,9 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Util.hpp" #include "Game/Util/ActorMovementUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DAnimation.hpp" -#include "JSystem/JGeometry/TUtil.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include +#include +#include namespace { f32 gxArray[] = {0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.2f, 1.0f, 0.2f, 0.0f, 0.5f, 1.0f, 0.5f, 0.0f, 1.0f, 1.0f, 1.0f}; diff --git a/src/Game/MapObj/CircleCoinGroup.cpp b/src/Game/MapObj/CircleCoinGroup.cpp index cb3a50d46..29cd7c23b 100644 --- a/src/Game/MapObj/CircleCoinGroup.cpp +++ b/src/Game/MapObj/CircleCoinGroup.cpp @@ -1,7 +1,7 @@ #include "Game/MapObj/CircleCoinGroup.hpp" #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include CircleCoinGroup::CircleCoinGroup(const char* pName) : CoinGroup(pName) { mCoinRadius = 200.0f; diff --git a/src/Game/MapObj/ClipAreaDropLaser.cpp b/src/Game/MapObj/ClipAreaDropLaser.cpp index 52b489436..9da3fd5f3 100644 --- a/src/Game/MapObj/ClipAreaDropLaser.cpp +++ b/src/Game/MapObj/ClipAreaDropLaser.cpp @@ -11,9 +11,9 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXGeometry.h" -#include "revolution/gx/GXPixel.h" +#include +#include +#include namespace NrvClipAreaDropLaser { NEW_NERVE(ClipAreaDropLaserNrvWait, ClipAreaDropLaser, Wait); diff --git a/src/Game/MapObj/ClipAreaShape.cpp b/src/Game/MapObj/ClipAreaShape.cpp index afb766a30..4b31b69c5 100644 --- a/src/Game/MapObj/ClipAreaShape.cpp +++ b/src/Game/MapObj/ClipAreaShape.cpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" #include "Game/Util/MtxUtil.hpp" -#include +#include "Game/Util.hpp" ClipAreaShape::ClipAreaShape(const char* pName) : mModelData(nullptr) { mModelData = MR::getJ3DModelData(pName); diff --git a/src/Game/MapObj/CocoNut.cpp b/src/Game/MapObj/CocoNut.cpp index 4a3e50a40..131870d22 100644 --- a/src/Game/MapObj/CocoNut.cpp +++ b/src/Game/MapObj/CocoNut.cpp @@ -5,7 +5,7 @@ #include "Game/NameObj/NameObjArchiveListCollector.hpp" #include "Game/Util.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JMath.hpp" +#include #include "math_types.hpp" namespace NrvCocoNut { diff --git a/src/Game/MapObj/Coin.cpp b/src/Game/MapObj/Coin.cpp index a087fc31c..947c8c607 100644 --- a/src/Game/MapObj/Coin.cpp +++ b/src/Game/MapObj/Coin.cpp @@ -5,7 +5,7 @@ #include "Game/MapObj/PurpleCoinHolder.hpp" #include "Game/NameObj/NameObjArchiveListCollector.hpp" #include "Game/Util.hpp" -#include "JSystem/JMath/JMath.hpp" +#include void Coin_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/MapObj/CoinSpot.cpp b/src/Game/MapObj/CoinSpot.cpp index d9bf64f98..35615ca73 100644 --- a/src/Game/MapObj/CoinSpot.cpp +++ b/src/Game/MapObj/CoinSpot.cpp @@ -5,7 +5,7 @@ #include "Game/Util/JMapUtil.hpp" #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/ObjUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include namespace NrvCoinSpot { NEW_NERVE(CoinSpotNrvWait, CoinSpot, Wait); diff --git a/src/Game/MapObj/CrystalCage.cpp b/src/Game/MapObj/CrystalCage.cpp index 2880eefe0..969c2296b 100644 --- a/src/Game/MapObj/CrystalCage.cpp +++ b/src/Game/MapObj/CrystalCage.cpp @@ -4,8 +4,8 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/MapObj/DummyDisplayModel.hpp" #include "Game/Util.hpp" -#include "JSystem/JGeometry/TUtil.hpp" -#include "JSystem/JMath.hpp" +#include +#include #include "math_types.hpp" void CrystalCage_FORCE_MATCH_SDATA2() { diff --git a/src/Game/MapObj/DesertLandMoveSwitch.cpp b/src/Game/MapObj/DesertLandMoveSwitch.cpp index 0ae6db02b..83ccd52f8 100644 --- a/src/Game/MapObj/DesertLandMoveSwitch.cpp +++ b/src/Game/MapObj/DesertLandMoveSwitch.cpp @@ -17,10 +17,10 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/SpringValue.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JMath/JMath.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include +#include +#include void DesertLandMoveSwitch_FORCE_MATCH_SDATA2() { (void)0.0f; diff --git a/src/Game/MapObj/DesertMovingLand.cpp b/src/Game/MapObj/DesertMovingLand.cpp index 7835ea60f..d4f05d20f 100644 --- a/src/Game/MapObj/DesertMovingLand.cpp +++ b/src/Game/MapObj/DesertMovingLand.cpp @@ -8,7 +8,7 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "revolution/mtx.h" +#include namespace { static const char* cDemoName = "砂漠ＵＦＯ上昇"; diff --git a/src/Game/MapObj/DriftWood.cpp b/src/Game/MapObj/DriftWood.cpp index 0133ff62c..962b7d56b 100644 --- a/src/Game/MapObj/DriftWood.cpp +++ b/src/Game/MapObj/DriftWood.cpp @@ -11,9 +11,9 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMath.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include +#include struct SinCosPair { f32 sin; diff --git a/src/Game/MapObj/DummyDisplayModel.cpp b/src/Game/MapObj/DummyDisplayModel.cpp index ac2bc3d8b..9ee86b5f2 100644 --- a/src/Game/MapObj/DummyDisplayModel.cpp +++ b/src/Game/MapObj/DummyDisplayModel.cpp @@ -8,8 +8,8 @@ #include "Game/Util/EventUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JMath/JMath.hpp" +#include +#include namespace { const static DummyDisplayModelInfo cDummyDisplayModelInfoTable[14] = { diff --git a/src/Game/MapObj/ElectricRailMoving.cpp b/src/Game/MapObj/ElectricRailMoving.cpp index 9f6351419..bd9901902 100644 --- a/src/Game/MapObj/ElectricRailMoving.cpp +++ b/src/Game/MapObj/ElectricRailMoving.cpp @@ -6,9 +6,9 @@ #include "Game/MapObj/ElectricRailHolder.hpp" #include "Game/Util.hpp" #include "Game/Util/SchedulerUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "revolution/gd/GDBase.h" -#include "revolution/gx/GXEnum.h" +#include +#include +#include namespace NrvElectricRailMoving { NEW_NERVE(ElectricRailMovingNrvWait, ElectricRailMoving, Wait); diff --git a/src/Game/MapObj/FireBar.cpp b/src/Game/MapObj/FireBar.cpp index e3ada3eb9..1a1eebb53 100644 --- a/src/Game/MapObj/FireBar.cpp +++ b/src/Game/MapObj/FireBar.cpp @@ -3,7 +3,7 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/Scene/SceneFunction.hpp" #include "Game/Util.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace NrvFireBar { NEW_NERVE(FireBarNrvWait, FireBar, Wait); diff --git a/src/Game/MapObj/FlipPanel.cpp b/src/Game/MapObj/FlipPanel.cpp index a23472997..5d8817d38 100644 --- a/src/Game/MapObj/FlipPanel.cpp +++ b/src/Game/MapObj/FlipPanel.cpp @@ -5,7 +5,7 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/MapObj/MapObjActorInitInfo.hpp" #include "Game/Util.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace { static u32 sBloomSyncStep; diff --git a/src/Game/MapObj/GCapture.cpp b/src/Game/MapObj/GCapture.cpp index 039687a02..9cae66bf4 100644 --- a/src/Game/MapObj/GCapture.cpp +++ b/src/Game/MapObj/GCapture.cpp @@ -23,11 +23,11 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/SpringValue.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include +#include #include "math_types.hpp" -#include "revolution/types.h" -#include "revolution/wpad.h" +#include +#include void GCapture_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/MapObj/GCaptureRibbon.cpp b/src/Game/MapObj/GCaptureRibbon.cpp index 393bec3b1..3b1c560f1 100644 --- a/src/Game/MapObj/GCaptureRibbon.cpp +++ b/src/Game/MapObj/GCaptureRibbon.cpp @@ -5,13 +5,13 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/ObjUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXGeometry.h" -#include "revolution/gx/GXPixel.h" -#include "revolution/gx/GXVert.h" -#include "revolution/types.h" +#include +#include +#include +#include +#include +#include +#include GCaptureRibbon::GCaptureRibbon(const char* pName) : LiveActor(pName), mTexture(), _990(), _994() { } diff --git a/src/Game/MapObj/GCaptureTarget.cpp b/src/Game/MapObj/GCaptureTarget.cpp index 52fa31c03..965abbc23 100644 --- a/src/Game/MapObj/GCaptureTarget.cpp +++ b/src/Game/MapObj/GCaptureTarget.cpp @@ -16,8 +16,8 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include void GCaptureTarget_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/MapObj/HipDropSwitch.cpp b/src/Game/MapObj/HipDropSwitch.cpp index fed442821..5c0551fd8 100644 --- a/src/Game/MapObj/HipDropSwitch.cpp +++ b/src/Game/MapObj/HipDropSwitch.cpp @@ -13,8 +13,8 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/SpringValue.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include +#include namespace { static const s32 sOnSomethingAcc = 0; diff --git a/src/Game/MapObj/HipDropTimerSwitch.cpp b/src/Game/MapObj/HipDropTimerSwitch.cpp index e5628e1c7..0106e17bd 100644 --- a/src/Game/MapObj/HipDropTimerSwitch.cpp +++ b/src/Game/MapObj/HipDropTimerSwitch.cpp @@ -16,10 +16,10 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/SpringValue.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include +#include +#include namespace { const char* const sTimerSeSet[2][4] = {{"SE_SY_TIMER_A_2", "SE_SY_TIMER_A_1", "SE_SY_TIMER_A_QUASI_0", "SE_SY_TIMER_A_0"}, diff --git a/src/Game/MapObj/JetTurtle.cpp b/src/Game/MapObj/JetTurtle.cpp index db50e6019..6ef883e2e 100644 --- a/src/Game/MapObj/JetTurtle.cpp +++ b/src/Game/MapObj/JetTurtle.cpp @@ -8,7 +8,7 @@ #include "Game/Util/ActorShadowUtil.hpp" #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/PlayerUtil.hpp" -#include "revolution/mtx.h" +#include #include namespace { diff --git a/src/Game/MapObj/KeySwitch.cpp b/src/Game/MapObj/KeySwitch.cpp index 6430abe9f..727bb3395 100644 --- a/src/Game/MapObj/KeySwitch.cpp +++ b/src/Game/MapObj/KeySwitch.cpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace { static const char* cDemoName = "カギ出現"; diff --git a/src/Game/MapObj/LavaBreakColumn.cpp b/src/Game/MapObj/LavaBreakColumn.cpp index 0a52286a9..09bb12e8e 100644 --- a/src/Game/MapObj/LavaBreakColumn.cpp +++ b/src/Game/MapObj/LavaBreakColumn.cpp @@ -7,8 +7,8 @@ #include "Game/Util/MapUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include void LavaBreakColumn_FORCE_MATCH_SDATA2() { (void)0.0f; diff --git a/src/Game/MapObj/LavaFloater.cpp b/src/Game/MapObj/LavaFloater.cpp index ac94e7a3f..22ae95e68 100644 --- a/src/Game/MapObj/LavaFloater.cpp +++ b/src/Game/MapObj/LavaFloater.cpp @@ -14,10 +14,10 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include +#include #include "math_types.hpp" -#include "revolution/types.h" +#include namespace { const char* const cEffectName = "LavaBubble"; diff --git a/src/Game/MapObj/LavaHomeSeesawRotator.cpp b/src/Game/MapObj/LavaHomeSeesawRotator.cpp index 9de3156c0..fc2a80655 100644 --- a/src/Game/MapObj/LavaHomeSeesawRotator.cpp +++ b/src/Game/MapObj/LavaHomeSeesawRotator.cpp @@ -9,7 +9,7 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include void LavaHomeSeesawRotator_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/MapObj/MapParts.cpp b/src/Game/MapObj/MapParts.cpp index 9207597a6..78271cc92 100644 --- a/src/Game/MapObj/MapParts.cpp +++ b/src/Game/MapObj/MapParts.cpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" -#include "JSystem/JMath/JMath.hpp" +#include #include "math_types.hpp" namespace { diff --git a/src/Game/MapObj/MarblePlanet.cpp b/src/Game/MapObj/MarblePlanet.cpp index 152181bd4..a5bb45887 100644 --- a/src/Game/MapObj/MarblePlanet.cpp +++ b/src/Game/MapObj/MarblePlanet.cpp @@ -3,7 +3,7 @@ #include "Game/LiveActor/ModelObj.hpp" #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" -#include "JSystem/JMath.hpp" +#include namespace NrvMarblePlanet { NEW_NERVE(MarblePlanetNrvWait, MarblePlanet, Wait); diff --git a/src/Game/MapObj/NormalMapBase.cpp b/src/Game/MapObj/NormalMapBase.cpp index aca66a43a..eb8b54a13 100644 --- a/src/Game/MapObj/NormalMapBase.cpp +++ b/src/Game/MapObj/NormalMapBase.cpp @@ -10,7 +10,7 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ModelUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include #include #include #include diff --git a/src/Game/MapObj/OceanWaveFloater.cpp b/src/Game/MapObj/OceanWaveFloater.cpp index ce95378c5..87bdc78c6 100644 --- a/src/Game/MapObj/OceanWaveFloater.cpp +++ b/src/Game/MapObj/OceanWaveFloater.cpp @@ -12,7 +12,7 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StringUtil.hpp" #include "math_types.hpp" -#include "revolution/types.h" +#include namespace { struct Param { diff --git a/src/Game/MapObj/PalmIsland.cpp b/src/Game/MapObj/PalmIsland.cpp index 140e53daf..2e0e5d929 100644 --- a/src/Game/MapObj/PalmIsland.cpp +++ b/src/Game/MapObj/PalmIsland.cpp @@ -8,8 +8,8 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "revolution/types.h" +#include +#include namespace NrvPalmIsland { NEW_NERVE(PalmIslandNrvWait, PalmIsland, Wait); diff --git a/src/Game/MapObj/PhantomShipBoxFloater.cpp b/src/Game/MapObj/PhantomShipBoxFloater.cpp index b9c5f16e7..5c5905203 100644 --- a/src/Game/MapObj/PhantomShipBoxFloater.cpp +++ b/src/Game/MapObj/PhantomShipBoxFloater.cpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/MapObj/FloaterFloatingForceTypeSpring.hpp" #include "Game/Util.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include namespace { const char* const cEffectName = "Ripple"; diff --git a/src/Game/MapObj/PhantomTorch.cpp b/src/Game/MapObj/PhantomTorch.cpp index dcd5ec808..6fe3a3949 100644 --- a/src/Game/MapObj/PhantomTorch.cpp +++ b/src/Game/MapObj/PhantomTorch.cpp @@ -1,4 +1,4 @@ -#include "Game\MapObj\PhantomTorch.hpp" +#include "Game/MapObj/PhantomTorch.hpp" #include "Game/Effect/SpinPullParticleCallBack.hpp" #include "Game/LiveActor/LiveActorGroup.hpp" #include "Game/LiveActor/Nerve.hpp" @@ -11,7 +11,7 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "revolution/types.h" +#include namespace NrvPhantomTorch { NEW_NERVE(HostTypeWait, PhantomTorch, Wait); diff --git a/src/Game/MapObj/PlantGroup.cpp b/src/Game/MapObj/PlantGroup.cpp index 5c267c10f..da5c95026 100644 --- a/src/Game/MapObj/PlantGroup.cpp +++ b/src/Game/MapObj/PlantGroup.cpp @@ -3,7 +3,7 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/Scene/SceneFunction.hpp" #include "Game/Util.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include namespace { const s32 hIsShakableStep = 20; diff --git a/src/Game/MapObj/PrizeRing.cpp b/src/Game/MapObj/PrizeRing.cpp index 497b6709a..c3d5abd7b 100644 --- a/src/Game/MapObj/PrizeRing.cpp +++ b/src/Game/MapObj/PrizeRing.cpp @@ -3,7 +3,7 @@ #include "Game/Util.hpp" #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "revolution/types.h" +#include #include namespace { diff --git a/src/Game/MapObj/RevolvingWay.cpp b/src/Game/MapObj/RevolvingWay.cpp index feb8b3f2f..77cac8710 100644 --- a/src/Game/MapObj/RevolvingWay.cpp +++ b/src/Game/MapObj/RevolvingWay.cpp @@ -7,7 +7,7 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "revolution/mtx.h" +#include #include namespace NrvRevolvingWay { diff --git a/src/Game/MapObj/Rock.cpp b/src/Game/MapObj/Rock.cpp index b027b0b9b..94525fd87 100644 --- a/src/Game/MapObj/Rock.cpp +++ b/src/Game/MapObj/Rock.cpp @@ -19,7 +19,7 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" #include -#include +#include "math_types.hpp" namespace { const Vec cWeakSensorOffset = {0.0f, 0.0f, -150.0f}; diff --git a/src/Game/MapObj/SnowFloor.cpp b/src/Game/MapObj/SnowFloor.cpp index 2f14deea5..411a42125 100644 --- a/src/Game/MapObj/SnowFloor.cpp +++ b/src/Game/MapObj/SnowFloor.cpp @@ -3,7 +3,7 @@ #include "Game/Util.hpp" #include "Game/Util/Color.hpp" #include "Game/Util/DirectDraw.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include namespace { u16 sTextureSize = 128; diff --git a/src/Game/MapObj/SnowFloorTile.cpp b/src/Game/MapObj/SnowFloorTile.cpp index 3be21a3c9..352ac817f 100644 --- a/src/Game/MapObj/SnowFloorTile.cpp +++ b/src/Game/MapObj/SnowFloorTile.cpp @@ -3,7 +3,7 @@ #include "Game/Util.hpp" #include "Game/Util/Color.hpp" #include "Game/Util/DirectDraw.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include namespace { u16 sTextureSize = 32; diff --git a/src/Game/MapObj/SoundEmitter.cpp b/src/Game/MapObj/SoundEmitter.cpp index babe574af..25993e692 100644 --- a/src/Game/MapObj/SoundEmitter.cpp +++ b/src/Game/MapObj/SoundEmitter.cpp @@ -10,7 +10,7 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JAudio2/JAISound.hpp" +#include namespace { const JAISoundID sSeTable[33] = {JAISoundID(0x1)}; diff --git a/src/Game/MapObj/SpinDriverShootPath.cpp b/src/Game/MapObj/SpinDriverShootPath.cpp index e7fdb045d..d213d59a5 100644 --- a/src/Game/MapObj/SpinDriverShootPath.cpp +++ b/src/Game/MapObj/SpinDriverShootPath.cpp @@ -1,7 +1,7 @@ #include "Game/MapObj/SpinDriverShootPath.hpp" #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" -#include "JSystem/JMath/JMath.hpp" +#include SpinDriverShootPath::SpinDriverShootPath() { mRailRider = nullptr; diff --git a/src/Game/MapObj/SpinningBox.cpp b/src/Game/MapObj/SpinningBox.cpp index d1428a9c0..ef2ddafb1 100644 --- a/src/Game/MapObj/SpinningBox.cpp +++ b/src/Game/MapObj/SpinningBox.cpp @@ -14,7 +14,7 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" -#include "JSystem/JGeometry/TUtil.hpp" +#include namespace { static const f32 hForceBindOffset = 65.0f; diff --git a/src/Game/MapObj/StageEffectDataTable.cpp b/src/Game/MapObj/StageEffectDataTable.cpp index f15ab8df2..9489505ed 100644 --- a/src/Game/MapObj/StageEffectDataTable.cpp +++ b/src/Game/MapObj/StageEffectDataTable.cpp @@ -5,7 +5,7 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "revolution/types.h" +#include void StageEffectDataTable_FORCE_MATCH_SDATA2() { (void)0.0f; diff --git a/src/Game/MapObj/StarPiece.cpp b/src/Game/MapObj/StarPiece.cpp index 54003b2e3..a15407750 100644 --- a/src/Game/MapObj/StarPiece.cpp +++ b/src/Game/MapObj/StarPiece.cpp @@ -22,11 +22,11 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" #include "Game/Util/TriangleFilter.hpp" -#include "JSystem/J3DGraphBase/J3DStruct.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXStruct.h" -#include "revolution/mtx.h" +#include +#include +#include +#include +#include #include const GXColor effectColors[] = {{0x00, 0x55, 0xff, 0xFF}, {0xFF, 0xFF, 0x00, 0xFF}, {0x55, 0xFF, 0x00, 0xFF}, {0x7F, 0x7F, 0x00, 0xFF}}; diff --git a/src/Game/MapObj/StarPieceFollowGroup.cpp b/src/Game/MapObj/StarPieceFollowGroup.cpp index 37cf06dd1..48f47f641 100644 --- a/src/Game/MapObj/StarPieceFollowGroup.cpp +++ b/src/Game/MapObj/StarPieceFollowGroup.cpp @@ -12,9 +12,9 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SceneUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include #include "math_types.hpp" -#include "revolution/mtx.h" +#include namespace NrvStarPieceFollowGroup { NEW_NERVE(HostTypeNrvFollowToPlayer, StarPieceFollowGroup, FollowToPlayer); diff --git a/src/Game/MapObj/StarPieceGroup.cpp b/src/Game/MapObj/StarPieceGroup.cpp index 2ebd08a99..f10d45314 100644 --- a/src/Game/MapObj/StarPieceGroup.cpp +++ b/src/Game/MapObj/StarPieceGroup.cpp @@ -12,7 +12,7 @@ #include "Game/Util/RailUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include void StarPieceGroup_FORCE_MATCH_SDATA2() { (void)1.0f; diff --git a/src/Game/MapObj/SuperSpinDriver.cpp b/src/Game/MapObj/SuperSpinDriver.cpp index b18aca96b..532878629 100644 --- a/src/Game/MapObj/SuperSpinDriver.cpp +++ b/src/Game/MapObj/SuperSpinDriver.cpp @@ -24,10 +24,10 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include +#include #include "math_types.hpp" -#include "revolution/wpad.h" +#include /* it seems like this file was compiled with an earlier compiler version */ diff --git a/src/Game/MapObj/TimerMoveWall.cpp b/src/Game/MapObj/TimerMoveWall.cpp index 629150c71..a217d5755 100644 --- a/src/Game/MapObj/TimerMoveWall.cpp +++ b/src/Game/MapObj/TimerMoveWall.cpp @@ -9,7 +9,7 @@ #include "Game/Util/JMapUtil.hpp" #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include void TimerMoveWall_FORCE_MATCH_SDATA2() { (void)0.0f; diff --git a/src/Game/MapObj/TrampleStar.cpp b/src/Game/MapObj/TrampleStar.cpp index 5d5b12579..8848ce60f 100644 --- a/src/Game/MapObj/TrampleStar.cpp +++ b/src/Game/MapObj/TrampleStar.cpp @@ -4,8 +4,8 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/Scene/SceneFunction.hpp" #include "Game/Util.hpp" -#include "JSystem/JKernel/JKRHeap.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include +#include namespace { f32 debug1 = 0.003331f; diff --git a/src/Game/MapObj/UFOBase.cpp b/src/Game/MapObj/UFOBase.cpp index 523fa4891..336a1122b 100644 --- a/src/Game/MapObj/UFOBase.cpp +++ b/src/Game/MapObj/UFOBase.cpp @@ -18,7 +18,7 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include #include #include diff --git a/src/Game/MapObj/WaterPressureBullet.cpp b/src/Game/MapObj/WaterPressureBullet.cpp index d3d0cad5c..8a8090d83 100644 --- a/src/Game/MapObj/WaterPressureBullet.cpp +++ b/src/Game/MapObj/WaterPressureBullet.cpp @@ -4,8 +4,8 @@ #include "Game/LiveActor/Nerve.hpp" #include "Game/Util.hpp" #include "Game/Util/ActorMovementUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "JSystem/JMath/JMath.hpp" +#include +#include namespace NrvWaterPressureBullet { NEW_NERVE(WaterPressureBulletNrvFly, WaterPressureBullet, Fly); diff --git a/src/Game/NPC/CollectTico.cpp b/src/Game/NPC/CollectTico.cpp index 1d9419db9..a03168561 100644 --- a/src/Game/NPC/CollectTico.cpp +++ b/src/Game/NPC/CollectTico.cpp @@ -9,7 +9,7 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SceneUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace NrvCollectTico { NEW_NERVE(CollectTicoNrvWait, CollectTico, Wait); diff --git a/src/Game/NPC/NPCActor.cpp b/src/Game/NPC/NPCActor.cpp index b5755e440..133d21c10 100644 --- a/src/Game/NPC/NPCActor.cpp +++ b/src/Game/NPC/NPCActor.cpp @@ -23,8 +23,8 @@ #include "Game/Util/RailUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JGeometry/TUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include +#include void NPCActor_DUMMY() { (void)JGeometry::TUtil< f32 >::acos(1.0f); diff --git a/src/Game/NPC/NPCParameter.cpp b/src/Game/NPC/NPCParameter.cpp index ec3943db7..f3ef8818e 100644 --- a/src/Game/NPC/NPCParameter.cpp +++ b/src/Game/NPC/NPCParameter.cpp @@ -3,8 +3,8 @@ #include "Game/NPC/NPCActor.hpp" #include "Game/NPC/NPCActorItem.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include NPCParameterEdit::NPCParameterEdit(const char* pName, const char** ppChar, bool a3) : NPCParameterBase(pName), _8(ppChar), _C(a3) { } diff --git a/src/Game/NPC/Rabbit.cpp b/src/Game/NPC/Rabbit.cpp index 1b1a373eb..b1cd00f06 100644 --- a/src/Game/NPC/Rabbit.cpp +++ b/src/Game/NPC/Rabbit.cpp @@ -22,8 +22,8 @@ #include "Game/Util/SoundUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" #include "Game/Util/TalkUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" +#include +#include namespace { static f32 cJumpSpeed = 20.0f; diff --git a/src/Game/NPC/Syati.cpp b/src/Game/NPC/Syati.cpp index 9bdaac022..991284fbb 100644 --- a/src/Game/NPC/Syati.cpp +++ b/src/Game/NPC/Syati.cpp @@ -3,7 +3,7 @@ #include "Game/MapObj/PrizeRing.hpp" #include "Game/Util.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include namespace { const char* cBckForRipple[5] = {"WaitReverse", "Talk", "StartWait", "StartTalk", "Delight"}; diff --git a/src/Game/NPC/TalkBalloon.cpp b/src/Game/NPC/TalkBalloon.cpp index 694a66ccd..baa90ee8e 100644 --- a/src/Game/NPC/TalkBalloon.cpp +++ b/src/Game/NPC/TalkBalloon.cpp @@ -13,9 +13,9 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/ScreenUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "JSystem/JMath/JMath.hpp" -#include "JSystem/JUtility/JUTVideo.hpp" +#include +#include +#include void TalkBalloon_DUMMY() { (void)JGeometry::TUtil< f32 >::acos(1.0f); diff --git a/src/Game/NPC/TalkMessageCtrl.cpp b/src/Game/NPC/TalkMessageCtrl.cpp index 2e249b71b..da57e51d5 100644 --- a/src/Game/NPC/TalkMessageCtrl.cpp +++ b/src/Game/NPC/TalkMessageCtrl.cpp @@ -22,9 +22,9 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/SceneUtil.hpp" #include "Game/Util/TalkUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/mtx.h" +#include +#include +#include TalkMessageCtrl::~TalkMessageCtrl() { } diff --git a/src/Game/NPC/TicoComet.cpp b/src/Game/NPC/TicoComet.cpp index a5693e80b..759a51e66 100644 --- a/src/Game/NPC/TicoComet.cpp +++ b/src/Game/NPC/TicoComet.cpp @@ -17,7 +17,7 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/ScreenUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace NrvTicoEat { NEW_NERVE(TicoEatNrvEatPre, TicoEat, EatPre); diff --git a/src/Game/NPC/TicoRail.cpp b/src/Game/NPC/TicoRail.cpp index c9f75af1f..3b34b1aba 100644 --- a/src/Game/NPC/TicoRail.cpp +++ b/src/Game/NPC/TicoRail.cpp @@ -11,7 +11,7 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/RailUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include namespace { static const s32 sStepForWait = 60; diff --git a/src/Game/NPC/TrickRabbit.cpp b/src/Game/NPC/TrickRabbit.cpp index 8c1197c0e..bc755f5db 100644 --- a/src/Game/NPC/TrickRabbit.cpp +++ b/src/Game/NPC/TrickRabbit.cpp @@ -32,7 +32,7 @@ #include "Game/Util/StarPointerUtil.hpp" #include "Game/Util/StringUtil.hpp" #include "Game/Util/TalkUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" +#include namespace { class RunnawayNodeSelector : public RailGraphNodeSelecter { diff --git a/src/Game/Player/FireMarioBall.cpp b/src/Game/Player/FireMarioBall.cpp index 7e9ff4df0..2ccc378f0 100644 --- a/src/Game/Player/FireMarioBall.cpp +++ b/src/Game/Player/FireMarioBall.cpp @@ -10,7 +10,7 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include namespace { f32 cSensorRadius = 80.0f; diff --git a/src/Game/Player/GhostPacket.cpp b/src/Game/Player/GhostPacket.cpp index e220088af..4160cf626 100644 --- a/src/Game/Player/GhostPacket.cpp +++ b/src/Game/Player/GhostPacket.cpp @@ -1,5 +1,5 @@ #include "Game/Player/GhostPacket.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include #include GhostPacket::GhostPacket(void* pData, u32 len) { diff --git a/src/Game/Player/J3DModelX.cpp b/src/Game/Player/J3DModelX.cpp index 2d2ce72f0..e6edf2f83 100644 --- a/src/Game/Player/J3DModelX.cpp +++ b/src/Game/Player/J3DModelX.cpp @@ -6,12 +6,12 @@ #include "Game/Util/MtxUtil.hpp" #include "Game/Util/SchedulerUtil.hpp" #include "Game/Util/ScreenUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DMtxBuffer.hpp" -#include "JSystem/J3DGraphBase/J3DMaterial.hpp" -#include "JSystem/J3DGraphBase/J3DShapeDraw.hpp" -#include "JSystem/J3DGraphBase/J3DShapeMtx.hpp" -#include "JSystem/JKernel/JKRHeap.hpp" -#include "JSystem/JUtility/JUTVideo.hpp" +#include +#include +#include +#include +#include +#include #include class J3DMtxBuffer2 : public J3DMtxBuffer { diff --git a/src/Game/Player/MarioActorDraw.cpp b/src/Game/Player/MarioActorDraw.cpp index 5e21476a5..eca753986 100644 --- a/src/Game/Player/MarioActorDraw.cpp +++ b/src/Game/Player/MarioActorDraw.cpp @@ -27,13 +27,13 @@ #include "Game/Util/MtxUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SchedulerUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DJoint.hpp" -#include "JSystem/J3DGraphAnimator/J3DModelData.hpp" -#include "JSystem/J3DGraphBase/J3DMaterial.hpp" -#include "JSystem/J3DGraphBase/J3DTexture.hpp" -#include "JSystem/JKernel/JKRSolidHeap.hpp" -#include "JSystem/JUtility/JUTNameTab.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/Game/Player/MarioActorEye.cpp b/src/Game/Player/MarioActorEye.cpp index 5b50f0dde..d2debdcb7 100644 --- a/src/Game/Player/MarioActorEye.cpp +++ b/src/Game/Player/MarioActorEye.cpp @@ -4,7 +4,7 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/ModelUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DAnimation.hpp" +#include static u8 sBlinkStates[] = {0, 1, 2, 2, 2, 2, 1, 1, 0, 0}; diff --git a/src/Game/Player/MarioActorGravity.cpp b/src/Game/Player/MarioActorGravity.cpp index 675947455..b07a56c1f 100644 --- a/src/Game/Player/MarioActorGravity.cpp +++ b/src/Game/Player/MarioActorGravity.cpp @@ -11,7 +11,7 @@ f32 JMAAcosRadian(f32) NO_INLINE; #include "Game/Util/GravityUtil.hpp" #include "Game/Util/MapUtil.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include const TVec3f& MarioActor::getGravityVec() const { return *mMario->getGravityVec(); diff --git a/src/Game/Player/MarioActorMorph.cpp b/src/Game/Player/MarioActorMorph.cpp index 2b39ddcf6..4d001366b 100644 --- a/src/Game/Player/MarioActorMorph.cpp +++ b/src/Game/Player/MarioActorMorph.cpp @@ -13,7 +13,7 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/MapUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "revolution/types.h" +#include void MarioActor::setPlayerMode(u16 playerMode, bool myBool) { if (mPlayerMode == playerMode) { diff --git a/src/Game/Player/MarioActorRushMsg.cpp b/src/Game/Player/MarioActorRushMsg.cpp index e6c02a651..d9d2609f2 100644 --- a/src/Game/Player/MarioActorRushMsg.cpp +++ b/src/Game/Player/MarioActorRushMsg.cpp @@ -5,7 +5,7 @@ #include "Game/Player/RushEndInfo.hpp" #include "Game/Screen/GameSceneLayoutHolder.hpp" #include "Game/Util/ActorSensorUtil.hpp" -#include "revolution/types.h" +#include void MarioActor::addRushSensor(HitSensor* pSensor, bool myBool) { if (!MR::isSensorAutoRush(pSensor) && !MR::isSensorRush(pSensor)) { diff --git a/src/Game/Player/MarioAnimator.cpp b/src/Game/Player/MarioAnimator.cpp index 305a22597..4438fcc97 100644 --- a/src/Game/Player/MarioAnimator.cpp +++ b/src/Game/Player/MarioAnimator.cpp @@ -18,7 +18,7 @@ #include "Game/Util/ModelUtil.hpp" #include "Game/Util/MtxUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include #include MarioAnimator::MarioAnimator(MarioActor* pActor) : MarioModule(pActor) { diff --git a/src/Game/Player/MarioBlown.cpp b/src/Game/Player/MarioBlown.cpp index bcf28705b..3e740c024 100644 --- a/src/Game/Player/MarioBlown.cpp +++ b/src/Game/Player/MarioBlown.cpp @@ -5,7 +5,7 @@ #include "Game/Player/MarioConst.hpp" #include "Game/Player/MarioState.hpp" #include "Game/Util/MathUtil.hpp" -#include "revolution/types.h" +#include bool Mario::blown(const TVec3f& rVec) { if (getCurrentStatus() == MarioStatus_Blown) { diff --git a/src/Game/Player/MarioCollision.cpp b/src/Game/Player/MarioCollision.cpp index 2447cd69a..89012042c 100644 --- a/src/Game/Player/MarioCollision.cpp +++ b/src/Game/Player/MarioCollision.cpp @@ -17,7 +17,7 @@ #include "Game/Util/MapUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "revolution/mtx.h" +#include #include bool Mario::isIgnoreTriangle(const Triangle* triangle) { diff --git a/src/Game/Player/MarioDamageCrush.cpp b/src/Game/Player/MarioDamageCrush.cpp index 020c1bd1d..f850b4e80 100644 --- a/src/Game/Player/MarioDamageCrush.cpp +++ b/src/Game/Player/MarioDamageCrush.cpp @@ -2,7 +2,7 @@ #include "Game/Player/MarioActor.hpp" #include "Game/Player/MarioCrush.hpp" #include "Game/Player/MarioState.hpp" -#include "revolution/types.h" +#include bool Mario::requestCrush() { _10._18 = true; diff --git a/src/Game/Player/MarioDamageParalyze.cpp b/src/Game/Player/MarioDamageParalyze.cpp index 798a3df5f..32a7a01ab 100644 --- a/src/Game/Player/MarioDamageParalyze.cpp +++ b/src/Game/Player/MarioDamageParalyze.cpp @@ -2,7 +2,7 @@ #include "Game/Player/MarioActor.hpp" #include "Game/Player/MarioParalyze.hpp" #include "Game/Player/MarioState.hpp" -#include "revolution/types.h" +#include bool Mario::doParalyze() { if (mMovementStates._1F) { diff --git a/src/Game/Player/MarioFaint.cpp b/src/Game/Player/MarioFaint.cpp index 431dd5da9..8bd2c6ae3 100644 --- a/src/Game/Player/MarioFaint.cpp +++ b/src/Game/Player/MarioFaint.cpp @@ -6,7 +6,7 @@ #include "Game/Player/MarioState.hpp" #include "Game/Player/MarioSwim.hpp" #include "Game/Util/MathUtil.hpp" -#include "revolution/types.h" +#include bool Mario::doFlipWeak(const TVec3f& rVec) { if (mMovementStates._1B) { diff --git a/src/Game/Player/MarioMove.cpp b/src/Game/Player/MarioMove.cpp index 97197e254..8784c3d7f 100644 --- a/src/Game/Player/MarioMove.cpp +++ b/src/Game/Player/MarioMove.cpp @@ -9,8 +9,8 @@ #include "Game/Player/MarioState.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include void Mario::mainMove() { TVec3f vec1; diff --git a/src/Game/Player/MarioMove2D.cpp b/src/Game/Player/MarioMove2D.cpp index 7bd357ba3..d3345259a 100644 --- a/src/Game/Player/MarioMove2D.cpp +++ b/src/Game/Player/MarioMove2D.cpp @@ -4,7 +4,7 @@ #include "Game/Util/AreaObjUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "revolution/mtx.h" +#include void Mario::check2DMode() { mMovementStates._37 = false; diff --git a/src/Game/Player/MarioParts.cpp b/src/Game/Player/MarioParts.cpp index a54af03d4..983f20720 100644 --- a/src/Game/Player/MarioParts.cpp +++ b/src/Game/Player/MarioParts.cpp @@ -5,8 +5,8 @@ #include "Game/Util/JMapInfo.hpp" #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/ModelUtil.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include MarioParts::MarioParts(LiveActor* pActor, const char* pName, const char* pModelName, bool a4, MtxPtr mtx1, MtxPtr mtx2) : PartsModel(pActor, pName, pModelName, mtx2, a4 ? MR::DrawBufferType_CrystalBox : MR::DrawBufferType_PlayerDecoration, true), _9C() { diff --git a/src/Game/Player/MarioPress.cpp b/src/Game/Player/MarioPress.cpp index ca4526f60..50a83280c 100644 --- a/src/Game/Player/MarioPress.cpp +++ b/src/Game/Player/MarioPress.cpp @@ -10,7 +10,7 @@ f32 JMAAcosRadian(f32) NO_INLINE; #include "Game/Util/ActorSensorUtil.hpp" #include "Game/Util/MapUtil.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" +#include bool Mario::checkPressDamage() { if (_5FC) { diff --git a/src/Game/Player/MarioSpecial.cpp b/src/Game/Player/MarioSpecial.cpp index 47e3e6924..262fe0029 100644 --- a/src/Game/Player/MarioSpecial.cpp +++ b/src/Game/Player/MarioSpecial.cpp @@ -6,7 +6,7 @@ #include "Game/Player/MarioState.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/SceneUtil.hpp" -#include "revolution/types.h" +#include void Mario::checkOnimasu(const HitSensor* pSensor) { if (strstr(pSensor->mHost->mName, "オニマス") == nullptr) { diff --git a/src/Game/Player/MarioStep.cpp b/src/Game/Player/MarioStep.cpp index e89aab85f..4fc68bde3 100644 --- a/src/Game/Player/MarioStep.cpp +++ b/src/Game/Player/MarioStep.cpp @@ -8,7 +8,7 @@ #include "Game/Util/MapUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "revolution/mtx.h" +#include void Mario::checkStep() { if (mMovementStates.jumping) { diff --git a/src/Game/Player/MarioStick.cpp b/src/Game/Player/MarioStick.cpp index d82da594a..5216f2bbd 100644 --- a/src/Game/Player/MarioStick.cpp +++ b/src/Game/Player/MarioStick.cpp @@ -7,7 +7,7 @@ #include "Game/Util/ActorSensorUtil.hpp" #include "Game/Util/MathUtil.hpp" #include "Game/Util/MtxUtil.hpp" -#include "revolution/mtx.h" +#include void Mario::checkBeeStick() { return; diff --git a/src/Game/Player/MarioTask.cpp b/src/Game/Player/MarioTask.cpp index fbbee39b6..1d5059d3e 100644 --- a/src/Game/Player/MarioTask.cpp +++ b/src/Game/Player/MarioTask.cpp @@ -3,8 +3,8 @@ #include "Game/Player/MarioActor.hpp" #include "Game/Player/MarioState.hpp" #include "Game/Util/MathUtil.hpp" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include extern "C" {} diff --git a/src/Game/Player/MarioWall.cpp b/src/Game/Player/MarioWall.cpp index 47e02cc59..7d5cf308a 100644 --- a/src/Game/Player/MarioWall.cpp +++ b/src/Game/Player/MarioWall.cpp @@ -8,7 +8,7 @@ #include "Game/Player/MarioSwim.hpp" #include "Game/Util/MapUtil.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include #include bool Mario::isWalling() const { diff --git a/src/Game/Player/ModelHolder.cpp b/src/Game/Player/ModelHolder.cpp index 7c0d2295a..5de71e64d 100644 --- a/src/Game/Player/ModelHolder.cpp +++ b/src/Game/Player/ModelHolder.cpp @@ -1,9 +1,9 @@ #include "Game/Player/ModelHolder.hpp" #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/ModelUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DModel.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "revolution/mtx.h" +#include +#include +#include ModelHolder::ModelHolder(const char* pName, bool b) : LiveActor(pName) { initModelManagerWithAnm(pName, nullptr, b); diff --git a/src/Game/RhythmLib/AudBgmTempoAdjuster.cpp b/src/Game/RhythmLib/AudBgmTempoAdjuster.cpp index aa8bfa433..d9623701a 100644 --- a/src/Game/RhythmLib/AudBgmTempoAdjuster.cpp +++ b/src/Game/RhythmLib/AudBgmTempoAdjuster.cpp @@ -1,7 +1,7 @@ #include "Game/RhythmLib/AudBgmTempoAdjuster.hpp" #include "Game/AudioLib/AudParams.hpp" -#include "JSystem/JAudio2/JAIStream.hpp" -#include "JSystem/JAudio2/JASCriticalSection.hpp" +#include +#include AudBgmTempoAdjuster::AudBgmTempoAdjuster() : mStream(), mBeatMul(1.0f), mIntroBeats(), mLoopBeats(), mLoopStartSamples(), mLoopEndSamples(), mLoopSamples() { diff --git a/src/Game/RhythmLib/AudMeChannelMgr.cpp b/src/Game/RhythmLib/AudMeChannelMgr.cpp index a19466599..76510021a 100644 --- a/src/Game/RhythmLib/AudMeChannelMgr.cpp +++ b/src/Game/RhythmLib/AudMeChannelMgr.cpp @@ -1,5 +1,5 @@ #include "Game/RhythmLib/AudMeChannelMgr.hpp" -#include "JSystem/JAudio2/JASChannel.hpp" +#include AudMeChannelMgr::AudMeChannelMgr(AudMeTrack* pTrack) : mTrack(pTrack) { mParams.init(); diff --git a/src/Game/RhythmLib/AudMePlayer.cpp b/src/Game/RhythmLib/AudMePlayer.cpp index 5be796a97..7132e39c3 100644 --- a/src/Game/RhythmLib/AudMePlayer.cpp +++ b/src/Game/RhythmLib/AudMePlayer.cpp @@ -6,7 +6,7 @@ #include "Game/RhythmLib/AudMeHandles.hpp" #include "Game/RhythmLib/AudMePlayer.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JAudio2/JASCriticalSection.hpp" +#include void AudMeHandle::releaseMe() { if (isMeAttached()) { diff --git a/src/Game/RhythmLib/AudMeTrack.cpp b/src/Game/RhythmLib/AudMeTrack.cpp index ecbe6d6f0..7a3967358 100644 --- a/src/Game/RhythmLib/AudMeTrack.cpp +++ b/src/Game/RhythmLib/AudMeTrack.cpp @@ -4,7 +4,7 @@ #include "Game/RhythmLib/AudMeChannelMgr.hpp" #include "Game/RhythmLib/AudMeSeqCtrl.hpp" #include "Game/RhythmLib/AudMeTrackCallback.hpp" -#include "JSystem/JAudio2/JASBank.hpp" +#include #include #include #include diff --git a/src/Game/RhythmLib/AudRhythmHolder.cpp b/src/Game/RhythmLib/AudRhythmHolder.cpp index 78c69c205..d5ca73f88 100644 --- a/src/Game/RhythmLib/AudRhythmHolder.cpp +++ b/src/Game/RhythmLib/AudRhythmHolder.cpp @@ -1,7 +1,7 @@ #include "Game/RhythmLib/AudRhythmHolder.hpp" #include "Game/RhythmLib/AudRhythmSeqParser.hpp" -#include "JSystem/JAudio2/JASCriticalSection.hpp" -#include "revolution/os/OSTime.h" +#include +#include AudRhythmHolder::AudRhythmHolder() : mIsPaused(), mSeqParser(), _168() { init(); diff --git a/src/Game/Scene/ScenarioSelectScene.cpp b/src/Game/Scene/ScenarioSelectScene.cpp index 82999211b..6458e211c 100644 --- a/src/Game/Scene/ScenarioSelectScene.cpp +++ b/src/Game/Scene/ScenarioSelectScene.cpp @@ -15,7 +15,7 @@ #include "Game/Util/ScreenUtil.hpp" #include "Game/Util/StarPointerUtil.hpp" #include "Game/Util/SystemUtil.hpp" -#include "revolution/gx/GXEnum.h" +#include #include #include diff --git a/src/Game/Scene/StageFileLoader.cpp b/src/Game/Scene/StageFileLoader.cpp index 9af7c8db9..4434cce1c 100644 --- a/src/Game/Scene/StageFileLoader.cpp +++ b/src/Game/Scene/StageFileLoader.cpp @@ -1,8 +1,8 @@ #include "Game/Scene/StageFileLoader.hpp" #include "Game/System/GalaxyStatusAccessor.hpp" #include "Game/Util.hpp" -#include "JSystem/JKernel/JKRArchive.hpp" -#include "JSystem/JKernel/JKRFileFinder.hpp" +#include +#include #include #include diff --git a/src/Game/Screen/GalaxyNamePlate.cpp b/src/Game/Screen/GalaxyNamePlate.cpp index 2f044eea4..89e6a7649 100644 --- a/src/Game/Screen/GalaxyNamePlate.cpp +++ b/src/Game/Screen/GalaxyNamePlate.cpp @@ -6,9 +6,9 @@ #include "Game/Util/MessageUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" -#include "revolution/types.h" -#include "runtime.h" +#include +#include +#include namespace { const s32 cAppearReadyFrame = 40; diff --git a/src/Game/Screen/LayoutGroupCtrl.cpp b/src/Game/Screen/LayoutGroupCtrl.cpp index 387c03143..d34d24dba 100644 --- a/src/Game/Screen/LayoutGroupCtrl.cpp +++ b/src/Game/Screen/LayoutGroupCtrl.cpp @@ -1,7 +1,7 @@ #include "Game/Screen/LayoutGroupCtrl.hpp" #include "Game/Animation/LayoutAnmPlayer.hpp" #include "Game/Screen/LayoutManager.hpp" -#include "nw4r/lyt/group.h" +#include LayoutGroupCtrl::LayoutGroupCtrl(LayoutManager* pManager, const char* pName, u32 animLayerCount) : mManager(pManager), mGroup(), mAnmPlayerArray(animLayerCount), _10(true) { diff --git a/src/Game/Screen/LayoutManager.cpp b/src/Game/Screen/LayoutManager.cpp index 6a88ab524..9b2ce7483 100644 --- a/src/Game/Screen/LayoutManager.cpp +++ b/src/Game/Screen/LayoutManager.cpp @@ -11,18 +11,18 @@ #include "Game/Util/ScreenUtil.hpp" #include "Game/Util/StringUtil.hpp" #include "Game/Util/SystemUtil.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" -#include "nw4r/lyt/group.h" -#include "nw4r/lyt/layout.h" -#include "nw4r/lyt/material.h" -#include "nw4r/lyt/pane.h" -#include "nw4r/lyt/picture.h" -#include "nw4r/lyt/texMap.h" -#include "nw4r/lyt/textBox.h" -#include "nw4r/ut/Rect.h" -#include "nw4r/ut/RuntimeTypeInfo.h" -#include "revolution/mtx.h" -#include "revolution/types.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/Game/Screen/WaterCameraFilter.cpp b/src/Game/Screen/WaterCameraFilter.cpp index 5cea67e63..a5c386838 100644 --- a/src/Game/Screen/WaterCameraFilter.cpp +++ b/src/Game/Screen/WaterCameraFilter.cpp @@ -12,15 +12,15 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/ScreenUtil.hpp" -#include "JSystem/JGeometry/TMatrix.hpp" -#include "JSystem/JKernel/JKRSolidHeap.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" -#include "JSystem/JUtility/JUTVideo.hpp" -#include "revolution/gx/GXBump.h" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXRegs.h" -#include "revolution/gx/GXStruct.h" -#include "revolution/gx/GXTransform.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace NrvWaterCameraFilter { NEW_NERVE(WaterCameraFilterNrvAir, WaterCameraFilter, Air); diff --git a/src/Game/Speaker/SpkWave.cpp b/src/Game/Speaker/SpkWave.cpp index 1b94da251..b13fdd822 100644 --- a/src/Game/Speaker/SpkWave.cpp +++ b/src/Game/Speaker/SpkWave.cpp @@ -1,5 +1,5 @@ #include "Game/Speaker/SpkWave.hpp" -#include "JSystem/JAudio2/JASCriticalSection.hpp" +#include #include SpkWave::SpkWave() : mResource(nullptr) { diff --git a/src/Game/System/GameEventValueChecker.cpp b/src/Game/System/GameEventValueChecker.cpp index 322dd0098..991c2f9a2 100644 --- a/src/Game/System/GameEventValueChecker.cpp +++ b/src/Game/System/GameEventValueChecker.cpp @@ -2,8 +2,8 @@ #include "Game/System/FindingLuigiEventScheduler.hpp" #include "Game/Util/HashUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JSupport/JSUMemoryInputStream.hpp" -#include "JSystem/JSupport/JSUMemoryOutputStream.hpp" +#include +#include namespace { const GameEventValue cGameEventValueTable[] = { diff --git a/src/Game/System/LayoutHolder.cpp b/src/Game/System/LayoutHolder.cpp index d7663424c..97b52c527 100644 --- a/src/Game/System/LayoutHolder.cpp +++ b/src/Game/System/LayoutHolder.cpp @@ -1,6 +1,6 @@ #include "Game/System/LayoutHolder.hpp" #include "Game/Util/SystemUtil.hpp" -#include "JSystem/JKernel/JKRFileFinder.hpp" +#include #include #include #include diff --git a/src/Game/System/Overwrite.cpp b/src/Game/System/Overwrite.cpp index 1ef74e184..c15a47c91 100644 --- a/src/Game/System/Overwrite.cpp +++ b/src/Game/System/Overwrite.cpp @@ -1,33 +1,33 @@ #include "Game/System/ShapePacketUserData.hpp" #include "Game/System/WPad.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/J3DGraphBase/J3DFifo.hpp" -#include "JSystem/J3DGraphBase/J3DPacket.hpp" -#include "JSystem/J3DGraphBase/J3DShapeMtx.hpp" -#include "JSystem/J3DGraphBase/J3DSys.hpp" -#include "JSystem/JAudio2/JASAramStream.hpp" -#include "JSystem/JAudio2/JASDriverIF.hpp" -#include "JSystem/JAudio2/JASDvdThread.hpp" -#include "JSystem/JAudio2/JASHeapCtrl.hpp" -#include "JSystem/JAudio2/JASTrack.hpp" -#include "JSystem/JAudio2/JASWaveArcLoader.hpp" -#include "JSystem/JAudio2/JAUInitializer.hpp" -#include "JSystem/JKernel/JKRAram.hpp" -#include "JSystem/JKernel/JKRAramPiece.hpp" -#include "JSystem/JKernel/JKRExpHeap.hpp" -#include "JSystem/JKernel/JKRSolidHeap.hpp" -#include "JSystem/JKernel/JKRThread.hpp" -#include "JSystem/JKernel/JKRUnitHeap.hpp" -#include "JSystem/JParticle/JPABaseShape.hpp" -#include "JSystem/JParticle/JPAEmitter.hpp" -#include "JSystem/JParticle/JPAEmitterManager.hpp" -#include "JSystem/JParticle/JPAFieldBlock.hpp" -#include "JSystem/JParticle/JPAParticle.hpp" -#include "JSystem/JSupport/JSUInputStream.hpp" -#include "JSystem/JSupport/JSUOutputStream.hpp" -#include "JSystem/JUtility/JUTConsole.hpp" -#include "JSystem/JUtility/JUTException.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/Game/System/WPadHVSwing.cpp b/src/Game/System/WPadHVSwing.cpp index 7b0361725..c784bac81 100644 --- a/src/Game/System/WPadHVSwing.cpp +++ b/src/Game/System/WPadHVSwing.cpp @@ -1,4 +1,4 @@ -#include "JSystem/JGeometry/TVec.hpp" +#include #include "Game/System/WPadHVSwing.hpp" #include "Game/System/WPad.hpp" diff --git a/src/Game/Util/ActorMovementUtil.cpp b/src/Game/Util/ActorMovementUtil.cpp index 7e2e449cc..8656e01ba 100644 --- a/src/Game/Util/ActorMovementUtil.cpp +++ b/src/Game/Util/ActorMovementUtil.cpp @@ -12,12 +12,12 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ObjUtil.hpp" #include "Game/Util/RailUtil.hpp" -#include "JSystem/JGeometry.hpp" -#include "JSystem/JGeometry/TUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "JSystem/JMath/JMath.hpp" +#include +#include +#include +#include #include "math_types.hpp" -#include "revolution/mtx.h" +#include #include namespace { diff --git a/src/Game/Util/ActorShadowUtil.cpp b/src/Game/Util/ActorShadowUtil.cpp index 829ea6929..f683c6591 100644 --- a/src/Game/Util/ActorShadowUtil.cpp +++ b/src/Game/Util/ActorShadowUtil.cpp @@ -14,9 +14,9 @@ #include "Game/Util/JointUtil.hpp" #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JMath/JMath.hpp" +#include #include "math_types.hpp" -#include "revolution/mtx.h" +#include namespace MR { void initShadowVolumeBox(LiveActor* pActor, const TVec3f& size) { diff --git a/src/Game/Util/DirectDraw.cpp b/src/Game/Util/DirectDraw.cpp index 1059525a8..f5d0670ef 100644 --- a/src/Game/Util/DirectDraw.cpp +++ b/src/Game/Util/DirectDraw.cpp @@ -7,10 +7,10 @@ #include "Game/Util/MtxUtil.hpp" #include "Game/Util/ScreenUtil.hpp" #include "Game/Util/SystemUtil.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include #include "math_types.hpp" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXVert.h" +#include +#include #include namespace { diff --git a/src/Game/Util/FurCtrl.cpp b/src/Game/Util/FurCtrl.cpp index 50d3b5f84..84fa26eec 100644 --- a/src/Game/Util/FurCtrl.cpp +++ b/src/Game/Util/FurCtrl.cpp @@ -11,10 +11,10 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SceneUtil.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DModel.hpp" -#include "JSystem/J3DGraphAnimator/J3DModelData.hpp" -#include "JSystem/J3DGraphBase/J3DShape.hpp" -#include "JSystem/JKernel/JKRHeap.hpp" +#include +#include +#include +#include #include #include #include diff --git a/src/Game/Util/FurDrawer.cpp b/src/Game/Util/FurDrawer.cpp index 0525654e7..241009ce9 100644 --- a/src/Game/Util/FurDrawer.cpp +++ b/src/Game/Util/FurDrawer.cpp @@ -3,8 +3,8 @@ #include "Game/Util/DirectDraw.hpp" #include "Game/Util/FurParam.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JKernel/JKRHeap.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include +#include #include FurDrawer::FurDrawer(u32 numLayers, ResTIMG* pBody, ResTIMG* pIndirect) diff --git a/src/Game/Util/FurMulti.cpp b/src/Game/Util/FurMulti.cpp index f52dad494..d5ed84e88 100644 --- a/src/Game/Util/FurMulti.cpp +++ b/src/Game/Util/FurMulti.cpp @@ -7,12 +7,12 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/MemoryUtil.hpp" #include "Game/Util/ModelUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DModel.hpp" -#include "JSystem/J3DGraphBase/J3DMaterial.hpp" -#include "JSystem/J3DGraphBase/J3DShape.hpp" -#include "JSystem/JKernel/JKRSolidHeap.hpp" -#include "JSystem/JUtility/JUTNameTab.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" +#include +#include +#include +#include +#include +#include #include namespace { diff --git a/src/Game/Util/FurShader.cpp b/src/Game/Util/FurShader.cpp index 2967588d0..a2e7e3ab3 100644 --- a/src/Game/Util/FurShader.cpp +++ b/src/Game/Util/FurShader.cpp @@ -1,11 +1,11 @@ #include "Game/Util/FurShader.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/J3DGraphBase/J3DMaterial.hpp" -#include "JSystem/J3DGraphBase/J3DShape.hpp" -#include "JSystem/J3DGraphBase/J3DShapeDraw.hpp" -#include "JSystem/JUtility/JUTNameTab.hpp" -#include "JSystem/JUtility/JUTTexture.hpp" -#include "revolution/gx/GXEnum.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/Game/Util/JMapInfo.cpp b/src/Game/Util/JMapInfo.cpp index 15f7fcea1..a708a1335 100644 --- a/src/Game/Util/JMapInfo.cpp +++ b/src/Game/Util/JMapInfo.cpp @@ -1,6 +1,6 @@ #include "Game/Util/JMapInfo.hpp" #include "Game/Util/StringUtil.hpp" -#include "JSystem/JGadget/hashcode.hpp" +#include JMapInfo::JMapInfo() { mData = nullptr; diff --git a/src/Game/Util/JointController.cpp b/src/Game/Util/JointController.cpp index fa130b23a..7784a4fa1 100644 --- a/src/Game/Util/JointController.cpp +++ b/src/Game/Util/JointController.cpp @@ -1,9 +1,9 @@ #include "Game/Util/JointController.hpp" #include "Game/Util/JointUtil.hpp" #include "Game/Util/ModelUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DJoint.hpp" -#include "JSystem/J3DGraphAnimator/J3DModel.hpp" -#include "JSystem/J3DGraphBase/J3DSys.hpp" +#include +#include +#include JointController::JointController() : mModel(), mJoint() { } diff --git a/src/Game/Util/JointRumbler.cpp b/src/Game/Util/JointRumbler.cpp index bcb21a999..8fc29d260 100644 --- a/src/Game/Util/JointRumbler.cpp +++ b/src/Game/Util/JointRumbler.cpp @@ -6,7 +6,7 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/RumbleCalculator.hpp" #include "math_types.hpp" -#include "revolution/types.h" +#include JointRumbler::JointRumbler(LiveActor* pActor, const char* pJointName, f32 a3, f32 a4, u32 a5, bool a6, s32 a7) : mRumbleCalculator(), mJointTransform(), _8(a7), _C(), mModelScale(1.0f), mFlags() { diff --git a/src/Game/Util/JointUtil.cpp b/src/Game/Util/JointUtil.cpp index 5aa3fcae4..a6621abce 100644 --- a/src/Game/Util/JointUtil.cpp +++ b/src/Game/Util/JointUtil.cpp @@ -1,6 +1,6 @@ #include "Game/Util/JointUtil.hpp" #include "Game/Util/ModelUtil.hpp" -#include "JSystem/J3DGraphBase/J3DMaterial.hpp" +#include #include #include #include diff --git a/src/Game/Util/MathUtil.cpp b/src/Game/Util/MathUtil.cpp index 4fb912a49..807013b1f 100644 --- a/src/Game/Util/MathUtil.cpp +++ b/src/Game/Util/MathUtil.cpp @@ -3,7 +3,7 @@ #include "Game/System/GameSystemObjHolder.hpp" #include "Game/Util/MtxUtil.hpp" #include "Game/Util/SingletonHolder.hpp" -#include "revolution/mtx.h" +#include #include #include #include diff --git a/src/Game/Util/MemoryUtil.cpp b/src/Game/Util/MemoryUtil.cpp index 0b5bb5901..f60dc3588 100644 --- a/src/Game/Util/MemoryUtil.cpp +++ b/src/Game/Util/MemoryUtil.cpp @@ -2,7 +2,7 @@ #include "Game/System/HeapMemoryWatcher.hpp" #include "Game/Util/MutexHolder.hpp" #include "Game/Util/SingletonHolder.hpp" -#include "JSystem/JAudio2/JASMutex.hpp" +#include #include #include #include diff --git a/src/Game/Util/MtxUtil.cpp b/src/Game/Util/MtxUtil.cpp index e578048e7..6783f0d2a 100644 --- a/src/Game/Util/MtxUtil.cpp +++ b/src/Game/Util/MtxUtil.cpp @@ -1,7 +1,7 @@ #include "Game/Util/MtxUtil.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JMath/JMATrigonometric.hpp" -#include "JSystem/JMath/JMath.hpp" +#include +#include static Mtx mtrans_org = {{1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}}; diff --git a/src/Game/Util/NPCUtil.cpp b/src/Game/Util/NPCUtil.cpp index 5c6549846..7337c847e 100644 --- a/src/Game/Util/NPCUtil.cpp +++ b/src/Game/Util/NPCUtil.cpp @@ -27,7 +27,7 @@ #include "Game/Util/MathUtil.hpp" #include "Game/Util/ModelUtil.hpp" #include "Game/Util/RailUtil.hpp" -#include "JSystem/J3DGraphAnimator/J3DAnimation.hpp" +#include #include void NPCUtil_FORCE_MATCH_SDATA2() { diff --git a/src/Game/Util/ParabolicPath.cpp b/src/Game/Util/ParabolicPath.cpp index b7ecdbfb5..fcd8e73e3 100644 --- a/src/Game/Util/ParabolicPath.cpp +++ b/src/Game/Util/ParabolicPath.cpp @@ -1,7 +1,7 @@ #include "Game/Util/ParabolicPath.hpp" #include "Game/Util.hpp" #include "Game/Util/MathUtil.hpp" -#include "JSystem/JGeometry/TVec.hpp" +#include ParabolicPath::ParabolicPath() : mPosition(0, 0, 0), mAxisY(0, 1, 0), mAxisZ(0, 0, 1) { _24 = 0.0f; diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/src/JSystem/J3DGraphBase/J3DGD.cpp index f2dafc29d..3d76629aa 100644 --- a/src/JSystem/J3DGraphBase/J3DGD.cpp +++ b/src/JSystem/J3DGraphBase/J3DGD.cpp @@ -3,11 +3,11 @@ #include #include -#include "revolution/gd/GDIndirect.h" -#include "revolution/gd/GDLight.h" -#include "revolution/gd/GDPixel.h" -#include "revolution/gd/GDTev.h" -#include "revolution/gd/GDTexture.h" +#include +#include +#include +#include +#include void J3DGDSetGenMode(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds, GXCullMode cm) { static u8 cm2hw[4] = {0, 2, 1, 3}; diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/src/JSystem/J3DGraphBase/J3DSys.cpp index b15ba53b7..68ae0638e 100644 --- a/src/JSystem/J3DGraphBase/J3DSys.cpp +++ b/src/JSystem/J3DGraphBase/J3DSys.cpp @@ -1,7 +1,7 @@ #include "JSystem/J3DGraphBase/J3DSys.hpp" #include "JSystem/J3DGraphBase/J3DFifo.hpp" #include "JSystem/J3DGraphBase/J3DTevs.hpp" -#include "revolution/gx/GXGeometry.h" +#include #include J3DSys j3dSys; diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp index 38b2d656b..2efd498e8 100644 --- a/src/JSystem/JAudio2/JASAramStream.cpp +++ b/src/JSystem/JAudio2/JASAramStream.cpp @@ -9,7 +9,7 @@ #include "JSystem/JKernel/JKRDvdRipper.hpp" #include "JSystem/JKernel/JKRSolidHeap.hpp" #include "JSystem/JSupport/JSupport.hpp" -#include "revolution/os/OSCache.h" +#include JASTaskThread* JASAramStream::sLoadThread; diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/src/JSystem/JAudio2/JASCalc.cpp index 30a4c9531..111fd08d2 100644 --- a/src/JSystem/JAudio2/JASCalc.cpp +++ b/src/JSystem/JAudio2/JASCalc.cpp @@ -1,4 +1,4 @@ -#include +#include "JSystem/JAudio2/JASCalc.hpp" #include static const s16 sIIRCutoff[128][4] = { diff --git a/src/JSystem/JAudio2/JASCallback.cpp b/src/JSystem/JAudio2/JASCallback.cpp index f5102915c..c6b3bdefd 100644 --- a/src/JSystem/JAudio2/JASCallback.cpp +++ b/src/JSystem/JAudio2/JASCallback.cpp @@ -1,6 +1,6 @@ #include "JSystem/JAudio2/JASCallback.hpp" #include "JSystem/JAudio2/JASTrack.hpp" -#include +#include "JSystem/JAudio2/JASCriticalSection.hpp" bool JASCallbackMgr::regist(JASCallback* pCallback, void* pArgument) { JASCriticalSection criticalSection; diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp index 6cbb000e9..88b5558ae 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp @@ -3,8 +3,8 @@ #include "JSystem/JAudio2/JASWaveArcLoader.hpp" #include "JSystem/JKernel/JKRExpHeap.hpp" #include "JSystem/JKernel/JKRSolidHeap.hpp" -#include "revolution/aralt.h" -#include "revolution/os/OSMutex.h" +#include +#include JASHeap::JASHeap(JASDisposer* pDisposer) : mTree(this), mDisposer(pDisposer), mBase(), mSize(), mHeap() { OSInitMutex(&mMutex); diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp index 810cfbbe1..25b05d66d 100644 --- a/src/JSystem/JAudio2/JASReport.cpp +++ b/src/JSystem/JAudio2/JASReport.cpp @@ -1,7 +1,7 @@ #include "JSystem/JAudio2/JASReport.hpp" #include "JSystem/JAudio2/JASCalc.hpp" #include "JSystem/JKernel/JKRHeap.hpp" -#include "revolution/os/OSThread.h" +#include #include #include diff --git a/src/JSystem/JAudio2/JAUStdSoundInfo.cpp b/src/JSystem/JAudio2/JAUStdSoundInfo.cpp index 0943f28cd..37fe588eb 100644 --- a/src/JSystem/JAudio2/JAUStdSoundInfo.cpp +++ b/src/JSystem/JAudio2/JAUStdSoundInfo.cpp @@ -5,7 +5,7 @@ #include "JSystem/JAudio2/JAIStream.hpp" #include "JSystem/JAudio2/JASGlobal.hpp" #include "JSystem/JAudio2/JAUSoundTable.hpp" -#include "revolution/dvd.h" +#include u16 JAUStdSoundInfo::getBgmSeqResourceID(JAISoundID soundID) const { void* data = JASGlobalInstance< JAUSoundTable >::getInstance()->getData(soundID); diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/src/JSystem/JKernel/JKRArchivePub.cpp index 85ff5eb90..065f0b0b0 100644 --- a/src/JSystem/JKernel/JKRArchivePub.cpp +++ b/src/JSystem/JKernel/JKRArchivePub.cpp @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRFileFinder.hpp" #include "JSystem/JKernel/JKRHeap.hpp" #include "JSystem/JKernel/JKRMemArchive.hpp" -#include "revolution.h" +#include JKRArchive* JKRArchive::check_mount_already(long entryNum) { JSUPtrLink* current = JKRFileLoader::sVolumeList.mHead; diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/src/JSystem/JKernel/JKRDecomp.cpp index 85e422169..f1d8e4eb6 100644 --- a/src/JSystem/JKernel/JKRDecomp.cpp +++ b/src/JSystem/JKernel/JKRDecomp.cpp @@ -1,7 +1,7 @@ #include "JSystem/JKernel/JKRDecomp.hpp" #include "JSystem/JKernel/JKRAramPiece.hpp" #include "JSystem/JKernel/JKRHeap.hpp" -#include "revolution.h" +#include #define NR_MESSAGES 8 diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index 3677824d3..a7651712b 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -7,7 +7,7 @@ #include "JSystem/JKernel/JKRDvdRipper.hpp" #include "JSystem/JKernel/JKRHeap.hpp" #include "JSystem/JUtility/JUTException.hpp" -#include "revolution/types.h" +#include #include #include #include diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index 933975d65..d8ef3918e 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -1,5 +1,5 @@ #include "JSystem/JKernel/JKRFileLoader.hpp" -#include "revolution.h" +#include JKRFileLoader* JKRFileLoader::sCurrentVolume; JSUList< JKRFileLoader > JKRFileLoader::sVolumeList = JSUList< JKRFileLoader >(); diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 0dd6ac1e1..003182989 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRDvdRipper.hpp" #include "JSystem/JKernel/JKRHeap.hpp" #include "JSystem/JUtility/JUTException.hpp" -#include "revolution.h" +#include #include JKRMemArchive::JKRMemArchive() { diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/src/JSystem/JUtility/JUTTexture.cpp index f549f2d2e..6dc46595b 100644 --- a/src/JSystem/JUtility/JUTTexture.cpp +++ b/src/JSystem/JUtility/JUTTexture.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "JSystem/JKernel/JKRHeap.hpp" +#include "JSystem/JUtility/JUTPalette.hpp" +#include "JSystem/JUtility/JUTTexture.hpp" JUTTexture::JUTTexture(int width, int height, GXTexFmt format) { mFlag = mFlag & 2 | 1; diff --git a/src/MSL_C/FILE_POS.c b/src/MSL_C/FILE_POS.c index 8c8366781..a1e635127 100644 --- a/src/MSL_C/FILE_POS.c +++ b/src/MSL_C/FILE_POS.c @@ -1,6 +1,6 @@ #include "file_struct.h" #include "buffer_io.h" -#include +#include "cerrno" #pragma exceptions on diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c index 2a7f467fd..7eb9889d7 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c @@ -1,4 +1,4 @@ -#include +#include "cmath" extern double sqrt(double x); diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c index 09c928503..ea61f64e7 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c @@ -1,4 +1,4 @@ -#include +#include "cmath" // clang-format off extern double sqrt(double); diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c index 4c75d5706..518c03174 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double __ieee754_atan2(double y, double x) { double z; diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c index 071ccc717..34d0b62ac 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c @@ -1,4 +1,4 @@ -#include +#include "cerrno" static const double ln2_hi = 6.93147180369123816490e-01, ln2_lo = 1.90821492927058770002e-10, two54 = 1.80143985094819840000e+16, Lg1 = 6.666666666666735130e-01, Lg2 = 3.999999999940941908e-01, Lg3 = 2.857142874366239149e-01, Lg4 = 2.222219843214978396e-01, diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c index 99395fb3d..d683dc580 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c @@ -1,5 +1,5 @@ -#include -#include +#include "cerrno" +#include "cmath" static const double two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */ ivln10 = 4.34294481903251816668e-01, /* 0x3FDBCB7B, 0x1526E50E */ diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c index 0d2d2cb4f..ee42a2ee9 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c @@ -1,5 +1,5 @@ -#include -#include +#include "cerrno" +#include "cmath" static const double bp[] = {1.0, 1.5,}, diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c index a36584286..88882c47a 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c @@ -1,5 +1,5 @@ -#include -#include +#include "cerrno" +#include "cmath" static const double one = 1.0; static const double tiny = 1.0e-300; diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c index edeb5f7b9..d4d70bee2 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c @@ -1,4 +1,4 @@ -#include +#include "cmath" const static int init_jk[] = {2, 3, 4, 6}; diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c index 9d04e6c72..441e60440 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double cos(double x) { double y[2], z = 0.0; diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c index c8f91bf5d..ec3afa724 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double sin(double x) { double y[2], z = 0.0; diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c index 008e80ac4..716b1c5f4 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double tan(double x) { double y[2], z = 0.0; diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c index 6b4edd8f6..4ad6dcf64 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double acos(double x) { return __ieee754_acos(x); diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c index d3689627b..cad32c6b1 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double asin(double x) { return __ieee754_asin(x); diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c index e56fee31e..c82861aa5 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double atan2(double y, double x) { return __ieee754_atan2(y, x); diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c index cfad44492..2b8ef2cc9 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double fmod(double x, double y) { return __ieee754_fmod(x, y); diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c index 89d4b3bec..50d9f3353 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double log10(double x) { return __ieee754_log10(x); diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c index 66706be8b..8f13f63c3 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double pow(double x, double y) { return __ieee754_pow(x, y); diff --git a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c index 0281ad561..2eb161835 100644 --- a/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c +++ b/src/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c @@ -1,4 +1,4 @@ -#include +#include "cmath" double sqrt(double x) { return __ieee754_sqrt(x); diff --git a/src/MSL_C/PPC_EABI/SRC/math_ppc.c b/src/MSL_C/PPC_EABI/SRC/math_ppc.c index 48130ebaa..e1e153d62 100644 --- a/src/MSL_C/PPC_EABI/SRC/math_ppc.c +++ b/src/MSL_C/PPC_EABI/SRC/math_ppc.c @@ -1,5 +1,5 @@ #include "math_api.h" -#include +#include "cmath" double nan(const char *x) { #define nan(x) NAN diff --git a/src/MSL_C/abort_exit_ppc_eabi.c b/src/MSL_C/abort_exit_ppc_eabi.c index aa291ac6c..70a99d73f 100644 --- a/src/MSL_C/abort_exit_ppc_eabi.c +++ b/src/MSL_C/abort_exit_ppc_eabi.c @@ -1,4 +1,4 @@ -#include +#include "cstdlib" #pragma exceptions on int raise(int); diff --git a/src/MSL_C/ansi_files.c b/src/MSL_C/ansi_files.c index f1bed4194..7c200c545 100644 --- a/src/MSL_C/ansi_files.c +++ b/src/MSL_C/ansi_files.c @@ -1,7 +1,7 @@ #include "file_struct.h" #include "ansi_files.h" #include "console_io.h" -#include +#include "cstdlib" #pragma exceptions on diff --git a/src/MSL_C/ansi_fp.c b/src/MSL_C/ansi_fp.c index 0c287a814..4f314616e 100644 --- a/src/MSL_C/ansi_fp.c +++ b/src/MSL_C/ansi_fp.c @@ -1,7 +1,7 @@ #include "ansi_fp.h" #include "math_api.h" #include "types.h" -#include +#include "cmath" #pragma exceptions on diff --git a/src/MSL_C/arith.c b/src/MSL_C/arith.c index a1591ed2d..b1962a7da 100644 --- a/src/MSL_C/arith.c +++ b/src/MSL_C/arith.c @@ -1,4 +1,4 @@ -#include +#include "cstdlib" int abs(int n) { if (n < 0) { diff --git a/src/MSL_C/errno.c b/src/MSL_C/errno.c index b48a85991..5047f004a 100644 --- a/src/MSL_C/errno.c +++ b/src/MSL_C/errno.c @@ -1,3 +1,3 @@ -#include +#include "cerrno" int errno; \ No newline at end of file diff --git a/src/MSL_C/float.c b/src/MSL_C/float.c index 9f3d5918b..5ba193a13 100644 --- a/src/MSL_C/float.c +++ b/src/MSL_C/float.c @@ -1,4 +1,4 @@ -#include +#include "cmath" int __float_nan[] = { 0x7FFFFFFF }; int __float_huge[] = { 0x7F800000 }; diff --git a/src/MSL_C/math_sun.c b/src/MSL_C/math_sun.c index 4b6c6208b..5ec51f53c 100644 --- a/src/MSL_C/math_sun.c +++ b/src/MSL_C/math_sun.c @@ -1,4 +1,4 @@ -#include +#include "cmath" #pragma exceptions on diff --git a/src/MSL_C/mbstring.c b/src/MSL_C/mbstring.c index 1ac603ce0..5e48a9c72 100644 --- a/src/MSL_C/mbstring.c +++ b/src/MSL_C/mbstring.c @@ -1,6 +1,6 @@ #include "mbstring.h" #include "locale.h" -#include +#include "cstring" #pragma exceptions on int mbtowc(wchar_t *pDest, const char *s, size_t num) { diff --git a/src/MSL_C/mem.c b/src/MSL_C/mem.c index 2cf8a17ca..7e7813a17 100644 --- a/src/MSL_C/mem.c +++ b/src/MSL_C/mem.c @@ -1,4 +1,4 @@ -#include +#include "cstring" #include "mem_funcs.h" #include "string_api.h" #pragma exceptions on diff --git a/src/MSL_C/printf.c b/src/MSL_C/printf.c index d53392fc3..c049c62f3 100644 --- a/src/MSL_C/printf.c +++ b/src/MSL_C/printf.c @@ -1,10 +1,10 @@ #include "ansi_fp.h" #include "wchar_io.h" -#include -#include -#include -#include -#include +#include "cctype" +#include "cmath" +#include "cstdarg" +#include "cstdio" +#include "cstdlib" #pragma exceptions on diff --git a/src/MSL_C/scanf.c b/src/MSL_C/scanf.c index 01be5269d..4d47d2b5c 100644 --- a/src/MSL_C/scanf.c +++ b/src/MSL_C/scanf.c @@ -1,8 +1,8 @@ #include "stdarg.h" #include "stdio_api.h" #include "va_list.h" -#include -#include +#include "cctype" +#include "cmath" #pragma exceptions on enum argument_options { diff --git a/src/MSL_C/string.c b/src/MSL_C/string.c index c73c6d397..2c07e12d3 100644 --- a/src/MSL_C/string.c +++ b/src/MSL_C/string.c @@ -1,4 +1,4 @@ -#include +#include "cstring" #define K1 0x80808080 #define K2 0xfefefeff diff --git a/src/MSL_C/strtold.c b/src/MSL_C/strtold.c index 3d51b4855..4a64ae9a0 100644 --- a/src/MSL_C/strtold.c +++ b/src/MSL_C/strtold.c @@ -1,8 +1,8 @@ #include "stdio_api.h" #include "ansi_fp.h" #include "locale.h" -#include -#include +#include "cctype" +#include "cmath" #include "mem.h" #pragma exceptions on diff --git a/src/MSL_C/strtoul.c b/src/MSL_C/strtoul.c index 820cff9a7..cdd90a82e 100644 --- a/src/MSL_C/strtoul.c +++ b/src/MSL_C/strtoul.c @@ -1,6 +1,6 @@ #include "stdio_api.h" -#include -#include +#include "cctype" +#include "cerrno" #pragma exceptions on diff --git a/src/MSL_C/wchar_io.c b/src/MSL_C/wchar_io.c index 9f4be11da..8d1796e8b 100644 --- a/src/MSL_C/wchar_io.c +++ b/src/MSL_C/wchar_io.c @@ -1,5 +1,5 @@ -#include -#include +#include "wchar_io.h" +#include "types.h" int fwide(FILE *pFile, int file_mode) { int orientation; diff --git a/src/MSL_C/wmem.c b/src/MSL_C/wmem.c index db48c061a..b12394e9a 100644 --- a/src/MSL_C/wmem.c +++ b/src/MSL_C/wmem.c @@ -1,5 +1,5 @@ #include "wchar_io.h" -#include +#include "cstring" wchar_t* wmemcpy(wchar_t *pDest, const wchar_t *pSrc, size_t num) { return (wchar_t*)memcpy(pDest, pSrc, num * sizeof(wchar_t)); diff --git a/src/MSL_C/wprintf.c b/src/MSL_C/wprintf.c index 5b7f81b59..f22d14d4b 100644 --- a/src/MSL_C/wprintf.c +++ b/src/MSL_C/wprintf.c @@ -3,11 +3,11 @@ #include "va_list.h" #include "wmem.h" #include "wstring.h" -#include -#include -#include -#include -#include +#include "cmath" +#include "cstdarg" +#include "cstdlib" +#include "cwctype" +#include "wchar_t.h" #pragma exceptions on diff --git a/src/MetroTRK/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c b/src/MetroTRK/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c index 6c290f4c5..ce0d2d6c0 100644 --- a/src/MetroTRK/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c +++ b/src/MetroTRK/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c @@ -2,7 +2,7 @@ #include "Os/dolphin/DDH_Stubs.h" #include "Os/dolphin/GDEV_Stubs.h" #include "Os/dolphin/UDP_Stubs.h" -#include "revolution/base/PPCArch.h" +#include #include "trk.h" void TRKInterruptHandler(); diff --git a/src/MetroTRK/debugger/embedded/MetroTRK/Portable/string_TRK.c b/src/MetroTRK/debugger/embedded/MetroTRK/Portable/string_TRK.c index 66fefb7a6..fd805d8f3 100644 --- a/src/MetroTRK/debugger/embedded/MetroTRK/Portable/string_TRK.c +++ b/src/MetroTRK/debugger/embedded/MetroTRK/Portable/string_TRK.c @@ -1,4 +1,4 @@ -#include "size_t.h" +#include #include "trk.h" diff --git a/src/MetroTRK/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c b/src/MetroTRK/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c index 083d8093f..c0bf182d6 100644 --- a/src/MetroTRK/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c +++ b/src/MetroTRK/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c @@ -3,7 +3,7 @@ * Description: */ -#include "revolution/types.h" +#include asm void TRK_flush_cache(u32, int) { // clang-format off diff --git a/src/RVLFaceLib/RFL_Controller.c b/src/RVLFaceLib/RFL_Controller.c index dd82abb6e..7fa7b7a73 100644 --- a/src/RVLFaceLib/RFL_Controller.c +++ b/src/RVLFaceLib/RFL_Controller.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include #include diff --git a/src/RVLFaceLib/RFL_DataUtility.c b/src/RVLFaceLib/RFL_DataUtility.c index ad6b128dc..ab10171ad 100644 --- a/src/RVLFaceLib/RFL_DataUtility.c +++ b/src/RVLFaceLib/RFL_DataUtility.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include // For masking out padding when comparing fields diff --git a/src/RVLFaceLib/RFL_Database.c b/src/RVLFaceLib/RFL_Database.c index 7a84757df..5dfff36c1 100644 --- a/src/RVLFaceLib/RFL_Database.c +++ b/src/RVLFaceLib/RFL_Database.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #define ASYNC_CRC_STEP 0x1400 diff --git a/src/RVLFaceLib/RFL_DefaultDatabase.c b/src/RVLFaceLib/RFL_DefaultDatabase.c index cebf2cb1c..740183b2e 100644 --- a/src/RVLFaceLib/RFL_DefaultDatabase.c +++ b/src/RVLFaceLib/RFL_DefaultDatabase.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" static const u8 scDefaultData[][sizeof(RFLiCharData)] = { // "Guest A" diff --git a/src/RVLFaceLib/RFL_Format.c b/src/RVLFaceLib/RFL_Format.c index d41a30000..0fd829181 100644 --- a/src/RVLFaceLib/RFL_Format.c +++ b/src/RVLFaceLib/RFL_Format.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include #define MAGIC_OFFICIAL_DB 'RNOD' diff --git a/src/RVLFaceLib/RFL_HiddenDatabase.c b/src/RVLFaceLib/RFL_HiddenDatabase.c index 611871fdf..d7bc70976 100644 --- a/src/RVLFaceLib/RFL_HiddenDatabase.c +++ b/src/RVLFaceLib/RFL_HiddenDatabase.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include static void writeData_(RFLiHiddenCharData* data) NO_INLINE; diff --git a/src/RVLFaceLib/RFL_Icon.c b/src/RVLFaceLib/RFL_Icon.c index aba7f7174..2fed1e725 100644 --- a/src/RVLFaceLib/RFL_Icon.c +++ b/src/RVLFaceLib/RFL_Icon.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" double atan2(double y, double x); diff --git a/src/RVLFaceLib/RFL_MakeRandomFace.c b/src/RVLFaceLib/RFL_MakeRandomFace.c index 82aa26d33..22902e4cf 100644 --- a/src/RVLFaceLib/RFL_MakeRandomFace.c +++ b/src/RVLFaceLib/RFL_MakeRandomFace.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include void RFLi_MakeRandomFace(RFLiCharInfo* info, RFLSex sex, RFLAge age, diff --git a/src/RVLFaceLib/RFL_MakeTex.c b/src/RVLFaceLib/RFL_MakeTex.c index a6665fab9..3d6b6ac57 100644 --- a/src/RVLFaceLib/RFL_MakeTex.c +++ b/src/RVLFaceLib/RFL_MakeTex.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include #include diff --git a/src/RVLFaceLib/RFL_MiddleDatabase.c b/src/RVLFaceLib/RFL_MiddleDatabase.c index 985456c0f..b94a74dad 100644 --- a/src/RVLFaceLib/RFL_MiddleDatabase.c +++ b/src/RVLFaceLib/RFL_MiddleDatabase.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" typedef struct RandomParam { u8 sex; // at 0x0 diff --git a/src/RVLFaceLib/RFL_Model.c b/src/RVLFaceLib/RFL_Model.c index 1b0896b07..653de220d 100644 --- a/src/RVLFaceLib/RFL_Model.c +++ b/src/RVLFaceLib/RFL_Model.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include #include #include diff --git a/src/RVLFaceLib/RFL_NANDAccess.c b/src/RVLFaceLib/RFL_NANDAccess.c index 1a8d863bb..b668cccfe 100644 --- a/src/RVLFaceLib/RFL_NANDAccess.c +++ b/src/RVLFaceLib/RFL_NANDAccess.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include #include #include diff --git a/src/RVLFaceLib/RFL_NANDLoader.c b/src/RVLFaceLib/RFL_NANDLoader.c index 9fceb3898..d1edb3cd1 100644 --- a/src/RVLFaceLib/RFL_NANDLoader.c +++ b/src/RVLFaceLib/RFL_NANDLoader.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include #include diff --git a/src/RVLFaceLib/RFL_System.c b/src/RVLFaceLib/RFL_System.c index 7a1694efe..ce3f88fb1 100644 --- a/src/RVLFaceLib/RFL_System.c +++ b/src/RVLFaceLib/RFL_System.c @@ -1,4 +1,4 @@ -#include +#include "RVLFaceLibInternal.h" #include #include #include diff --git a/src/RVL_SDK/ai/ai.c b/src/RVL_SDK/ai/ai.c index d2720c12c..5562a3b00 100644 --- a/src/RVL_SDK/ai/ai.c +++ b/src/RVL_SDK/ai/ai.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "private/flipper.h" +#include "revolution/ai.h" +#include "revolution/os.h" static AIDCallback __AID_Callback; static u8* __CallbackStack; diff --git a/src/RVL_SDK/aralt/aralt.c b/src/RVL_SDK/aralt/aralt.c index 6c2f337d5..36bc3984a 100644 --- a/src/RVL_SDK/aralt/aralt.c +++ b/src/RVL_SDK/aralt/aralt.c @@ -1,7 +1,7 @@ #include "revolution/os/OSInterrupt.h" #include -#include -#include +#include "revolution/aralt.h" +#include "revolution/os.h" static u32 __AR_init_flag; static s32 __ARQ_init_flag; diff --git a/src/RVL_SDK/arc/arc.c b/src/RVL_SDK/arc/arc.c index ab37a0c17..95f4f9593 100644 --- a/src/RVL_SDK/arc/arc.c +++ b/src/RVL_SDK/arc/arc.c @@ -1,4 +1,4 @@ -#include +#include "revolution.h" #include #include diff --git a/src/RVL_SDK/axfx/AXFXHooks.c b/src/RVL_SDK/axfx/AXFXHooks.c index 5af26a572..caaa73ece 100644 --- a/src/RVL_SDK/axfx/AXFXHooks.c +++ b/src/RVL_SDK/axfx/AXFXHooks.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include "revolution/axfx.h" +#include "revolution/os.h" +#include "revolution/os/OSAlloc.h" static void* __AXFXAllocFunction(size_t size); static void __AXFXFreeFunction(void* block); diff --git a/src/RVL_SDK/axfx/AXFXReverbHi.c b/src/RVL_SDK/axfx/AXFXReverbHi.c index 6fdda50e1..e3ba41a4b 100644 --- a/src/RVL_SDK/axfx/AXFXReverbHi.c +++ b/src/RVL_SDK/axfx/AXFXReverbHi.c @@ -1,5 +1,5 @@ #include "revolution/axfx.h" -#include +#include "revolution.h" static void __ParamConvert(AXFX_REVERBHI* fx) { fx->exp.earlyMode = 5; diff --git a/src/RVL_SDK/base/PPCArch.c b/src/RVL_SDK/base/PPCArch.c index c279f8463..ebcd625fb 100644 --- a/src/RVL_SDK/base/PPCArch.c +++ b/src/RVL_SDK/base/PPCArch.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/base/PPCArch.h" +#include "revolution/os.h" union Fpscr { f64 f; diff --git a/src/RVL_SDK/bte/bd.c b/src/RVL_SDK/bte/bd.c index 3929b7264..4db249296 100644 --- a/src/RVL_SDK/bte/bd.c +++ b/src/RVL_SDK/bte/bd.c @@ -1,4 +1,4 @@ -#include "bd.h" +#include /* Original source: * bluedroid @@ -29,7 +29,7 @@ * headers */ -#include "bt_types.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bd.h b/src/RVL_SDK/bte/bd.h index e6df6f0de..c859a5a24 100644 --- a/src/RVL_SDK/bte/bd.h +++ b/src/RVL_SDK/bte/bd.h @@ -30,7 +30,7 @@ * headers */ -#include "bt_types.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bt_target.h b/src/RVL_SDK/bte/bt_target.h index ff4ca945e..52bd8d7e2 100644 --- a/src/RVL_SDK/bte/bt_target.h +++ b/src/RVL_SDK/bte/bt_target.h @@ -30,10 +30,10 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "gki_target.h" +#include /******************************************************************************* * Configuration options, sorted as seen in bluedroid's bt_target.h diff --git a/src/RVL_SDK/bte/bt_trace.h b/src/RVL_SDK/bte/bt_trace.h index 9adfbb1c3..3b2061209 100644 --- a/src/RVL_SDK/bte/bt_trace.h +++ b/src/RVL_SDK/bte/bt_trace.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * Log functions diff --git a/src/RVL_SDK/bte/bt_types.h b/src/RVL_SDK/bte/bt_types.h index ba13b6fcd..01e5aa396 100644 --- a/src/RVL_SDK/bte/bt_types.h +++ b/src/RVL_SDK/bte/bt_types.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_aa_cfg.c b/src/RVL_SDK/bte/bta_aa_cfg.c index 96a61ad8a..b64943d33 100644 --- a/src/RVL_SDK/bte/bta_aa_cfg.c +++ b/src/RVL_SDK/bte/bta_aa_cfg.c @@ -1,12 +1,12 @@ -#include "bta_aa_int.h" +#include /******************************************************************************* * headers */ -#include "data_types.h" +#include -#include "bta_aa_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_aa_int.h b/src/RVL_SDK/bte/bta_aa_int.h index 39c2845af..a7fce3cd8 100644 --- a/src/RVL_SDK/bte/bta_aa_int.h +++ b/src/RVL_SDK/bte/bta_aa_int.h @@ -5,9 +5,9 @@ * headers */ -#include "data_types.h" +#include -#include "bta_aa_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_ag_api.h b/src/RVL_SDK/bte/bta_ag_api.h index 78af8fe87..11dfcb36a 100644 --- a/src/RVL_SDK/bte/bta_ag_api.h +++ b/src/RVL_SDK/bte/bta_ag_api.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_ag_cfg.c b/src/RVL_SDK/bte/bta_ag_cfg.c index 94f506e98..4bf28b91a 100644 --- a/src/RVL_SDK/bte/bta_ag_cfg.c +++ b/src/RVL_SDK/bte/bta_ag_cfg.c @@ -1,4 +1,4 @@ -#include "bta_ag_int.h" +#include /* Original source: * bluedroid @@ -29,7 +29,7 @@ * headers */ -#include "bta_ag_api.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_ag_int.h b/src/RVL_SDK/bte/bta_ag_int.h index 535eb08a2..d18677462 100644 --- a/src/RVL_SDK/bte/bta_ag_int.h +++ b/src/RVL_SDK/bte/bta_ag_int.h @@ -30,7 +30,7 @@ * headers */ -#include "bta_ag_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_api.h b/src/RVL_SDK/bte/bta_api.h index a87f11fe6..30300df6e 100644 --- a/src/RVL_SDK/bte/bta_api.h +++ b/src/RVL_SDK/bte/bta_api.h @@ -30,8 +30,8 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_av_cfg.c b/src/RVL_SDK/bte/bta_av_cfg.c index 2164c638d..d8a538d44 100644 --- a/src/RVL_SDK/bte/bta_av_cfg.c +++ b/src/RVL_SDK/bte/bta_av_cfg.c @@ -1,4 +1,4 @@ -#include "bta_av_int.h" +#include /* Original source: * bluedroid @@ -29,9 +29,9 @@ * headers */ -#include "data_types.h" +#include -#include "bta_av_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_av_int.h b/src/RVL_SDK/bte/bta_av_int.h index af957ff8d..57d84b404 100644 --- a/src/RVL_SDK/bte/bta_av_int.h +++ b/src/RVL_SDK/bte/bta_av_int.h @@ -30,9 +30,9 @@ * headers */ -#include "data_types.h" +#include -#include "bta_av_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_bi_cfg.c b/src/RVL_SDK/bte/bta_bi_cfg.c index e1a05b3d3..470dc80f5 100644 --- a/src/RVL_SDK/bte/bta_bi_cfg.c +++ b/src/RVL_SDK/bte/bta_bi_cfg.c @@ -1,12 +1,12 @@ -#include "bta_bi_int.h" +#include /******************************************************************************* * headers */ -#include "data_types.h" +#include -#include "bta_bi_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_bi_int.h b/src/RVL_SDK/bte/bta_bi_int.h index 3976e916c..5c56266a9 100644 --- a/src/RVL_SDK/bte/bta_bi_int.h +++ b/src/RVL_SDK/bte/bta_bi_int.h @@ -5,9 +5,9 @@ * headers */ -#include "data_types.h" +#include -#include "bta_bi_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_cg_cfg.c b/src/RVL_SDK/bte/bta_cg_cfg.c index b011d857c..da3c1d2b2 100644 --- a/src/RVL_SDK/bte/bta_cg_cfg.c +++ b/src/RVL_SDK/bte/bta_cg_cfg.c @@ -1,10 +1,10 @@ -#include "bta_cg_int.h" +#include /******************************************************************************* * headers */ -#include "bta_cg_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_cg_int.h b/src/RVL_SDK/bte/bta_cg_int.h index 86667fbbd..21a56d6d3 100644 --- a/src/RVL_SDK/bte/bta_cg_int.h +++ b/src/RVL_SDK/bte/bta_cg_int.h @@ -5,7 +5,7 @@ * headers */ -#include "bta_cg_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_ct_cfg.c b/src/RVL_SDK/bte/bta_ct_cfg.c index 3640f4e37..93d05efc0 100644 --- a/src/RVL_SDK/bte/bta_ct_cfg.c +++ b/src/RVL_SDK/bte/bta_ct_cfg.c @@ -1,10 +1,10 @@ -#include "bta_ct_int.h" +#include /******************************************************************************* * headers */ -#include "bta_ct_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_ct_int.h b/src/RVL_SDK/bte/bta_ct_int.h index 9c2d38608..2559e5fb0 100644 --- a/src/RVL_SDK/bte/bta_ct_int.h +++ b/src/RVL_SDK/bte/bta_ct_int.h @@ -5,7 +5,7 @@ * headers */ -#include "bta_ct_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_dg_cfg.c b/src/RVL_SDK/bte/bta_dg_cfg.c index 63758e8eb..d0b25d8d4 100644 --- a/src/RVL_SDK/bte/bta_dg_cfg.c +++ b/src/RVL_SDK/bte/bta_dg_cfg.c @@ -1,10 +1,10 @@ -#include "bta_dg_int.h" +#include /******************************************************************************* * headers */ -#include "bta_dg_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_dg_int.h b/src/RVL_SDK/bte/bta_dg_int.h index 1b548d46b..4b9154f25 100644 --- a/src/RVL_SDK/bte/bta_dg_int.h +++ b/src/RVL_SDK/bte/bta_dg_int.h @@ -5,7 +5,7 @@ * headers */ -#include "bta_dg_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_dm_act.c b/src/RVL_SDK/bte/bta_dm_act.c index fd1459e98..b48751da0 100644 --- a/src/RVL_SDK/bte/bta_dm_act.c +++ b/src/RVL_SDK/bte/bta_dm_act.c @@ -1,4 +1,4 @@ -#include "bta_dm_int.h" +#include /* Original source: * bluedroid @@ -31,30 +31,30 @@ #include -#include +#include "revolution/types.h" -#include // unk_t +#include "decomp.h" // unk_t -#include "bt_target.h" -#include "bt_trace.h" // APPL_TRACE -#include "bt_types.h" -#include "data_types.h" +#include +#include // APPL_TRACE +#include +#include -#include "bd.h" -#include "bta_api.h" -#include "bta_dm_co.h" // bta_dm_co_get_compress_memory -#include "bta_sys.h" -#include "bta_sys_int.h" // bta_sys_cb -#include "btm_api.h" -#include "btm_int.h" -#include "btu.h" // BT_BD_ANY -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" // btsnd_hcic_write_scan_enable -#include "l2c_api.h" -#include "sdp_api.h" -#include "sdpdefs.h" -#include "wbt_api.h" +#include +#include +#include // bta_dm_co_get_compress_memory +#include +#include // bta_sys_cb +#include +#include +#include // BT_BD_ANY +#include +#include +#include // btsnd_hcic_write_scan_enable +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/bta_dm_api.c b/src/RVL_SDK/bte/bta_dm_api.c index 883c51fbc..ad68f8e8c 100644 --- a/src/RVL_SDK/bte/bta_dm_api.c +++ b/src/RVL_SDK/bte/bta_dm_api.c @@ -1,4 +1,4 @@ -#include "bta_api.h" +#include /* Original source: * bluedroid @@ -32,15 +32,15 @@ #include "revolution/types.h" #include -#include "bt_target.h" // BTA_DM_REMOTE_DEVICE_NAME_LENGTH -#include "bt_types.h" -#include "data_types.h" +#include // BTA_DM_REMOTE_DEVICE_NAME_LENGTH +#include +#include -#include "bd.h" // bdcpy -#include "bta_dm_int.h" -#include "bta_sys.h" -#include "btm_api.h" -#include "gki.h" +#include // bdcpy +#include +#include +#include +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_dm_cfg.c b/src/RVL_SDK/bte/bta_dm_cfg.c index f1c91dc23..eb16373e8 100644 --- a/src/RVL_SDK/bte/bta_dm_cfg.c +++ b/src/RVL_SDK/bte/bta_dm_cfg.c @@ -1,5 +1,5 @@ -#include "bta_api.h" -#include "bta_dm_int.h" +#include +#include /* Original source: * bluedroid @@ -30,11 +30,11 @@ * headers */ -#include "bt_target.h" +#include -#include "bta_sys.h" -#include "btm_api.h" -#include "hcidefs.h" +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_dm_co.h b/src/RVL_SDK/bte/bta_dm_co.h index 226bd7ad3..00eb23894 100644 --- a/src/RVL_SDK/bte/bta_dm_co.h +++ b/src/RVL_SDK/bte/bta_dm_co.h @@ -30,9 +30,9 @@ * headers */ -#include "data_types.h" +#include -#include "bta_sys.h" +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/bta_dm_int.h b/src/RVL_SDK/bte/bta_dm_int.h index aedf5573c..6a51ee1f7 100644 --- a/src/RVL_SDK/bte/bta_dm_int.h +++ b/src/RVL_SDK/bte/bta_dm_int.h @@ -30,18 +30,18 @@ * headers */ -#include +#include "decomp.h" -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "bta_api.h" -#include "bta_sys.h" -#include "btm_api.h" -#include "gki.h" -#include "hcidefs.h" -#include "sdp_api.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_dm_main.c b/src/RVL_SDK/bte/bta_dm_main.c index ced4b2268..304edd998 100644 --- a/src/RVL_SDK/bte/bta_dm_main.c +++ b/src/RVL_SDK/bte/bta_dm_main.c @@ -1,4 +1,4 @@ -#include "bta_dm_int.h" +#include /* Original source: * bluedroid @@ -29,10 +29,10 @@ * headers */ -#include "bt_types.h" // BT_HDR -#include "data_types.h" +#include // BT_HDR +#include -#include "bta_sys.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_dm_pm.c b/src/RVL_SDK/bte/bta_dm_pm.c index 2b9fc8bc3..7d55687ac 100644 --- a/src/RVL_SDK/bte/bta_dm_pm.c +++ b/src/RVL_SDK/bte/bta_dm_pm.c @@ -1,4 +1,4 @@ -#include "bta_dm_int.h" +#include /* Original source: * bluedroid @@ -32,16 +32,16 @@ #include "revolution/types.h" #include -#include "bt_trace.h" -#include "bt_types.h" // BD_ADDR -#include "data_types.h" +#include +#include // BD_ADDR +#include -#include "bd.h" -#include "bta_api.h" -#include "bta_sys.h" -#include "btm_api.h" -#include "gki.h" // GKI_getbuf -#include "hcidefs.h" +#include +#include +#include +#include +#include // GKI_getbuf +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/bta_fs_api.h b/src/RVL_SDK/bte/bta_fs_api.h index caf273278..9ce67426f 100644 --- a/src/RVL_SDK/bte/bta_fs_api.h +++ b/src/RVL_SDK/bte/bta_fs_api.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_fs_cfg.c b/src/RVL_SDK/bte/bta_fs_cfg.c index 4dfba352f..81e0c2414 100644 --- a/src/RVL_SDK/bte/bta_fs_cfg.c +++ b/src/RVL_SDK/bte/bta_fs_cfg.c @@ -1,4 +1,4 @@ -#include "bta_fs_api.h" +#include /* Original source: * bluedroid diff --git a/src/RVL_SDK/bte/bta_fs_ci.c b/src/RVL_SDK/bte/bta_fs_ci.c index d26197ca2..54d1ac2c8 100644 --- a/src/RVL_SDK/bte/bta_fs_ci.c +++ b/src/RVL_SDK/bte/bta_fs_ci.c @@ -1,4 +1,4 @@ -#include "bta_fs_ci.h" +#include /* Original source: * bluedroid @@ -31,11 +31,11 @@ #include // NULL -#include "data_types.h" +#include -#include "bta_fs_co.h" -#include "bta_sys.h" // bta_sys_sendmsg -#include "gki.h" // GKI_getbuf +#include +#include // bta_sys_sendmsg +#include // GKI_getbuf /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/bta_fs_ci.h b/src/RVL_SDK/bte/bta_fs_ci.h index 396967f41..0b7f0fce9 100644 --- a/src/RVL_SDK/bte/bta_fs_ci.h +++ b/src/RVL_SDK/bte/bta_fs_ci.h @@ -30,10 +30,10 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "bta_fs_co.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_fs_co.h b/src/RVL_SDK/bte/bta_fs_co.h index f3fdd081a..4030ddc14 100644 --- a/src/RVL_SDK/bte/bta_fs_co.h +++ b/src/RVL_SDK/bte/bta_fs_co.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_ft_cfg.c b/src/RVL_SDK/bte/bta_ft_cfg.c index 070cc4570..6a09240d5 100644 --- a/src/RVL_SDK/bte/bta_ft_cfg.c +++ b/src/RVL_SDK/bte/bta_ft_cfg.c @@ -1,10 +1,10 @@ -#include "bta_ft_int.h" +#include /******************************************************************************* * headers */ -#include "bta_ft_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_ft_int.h b/src/RVL_SDK/bte/bta_ft_int.h index 5f21bb779..006af5c72 100644 --- a/src/RVL_SDK/bte/bta_ft_int.h +++ b/src/RVL_SDK/bte/bta_ft_int.h @@ -5,7 +5,7 @@ * headers */ -#include "bta_ft_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_hd_act.c b/src/RVL_SDK/bte/bta_hd_act.c index 3c91be2dd..6856e6c84 100644 --- a/src/RVL_SDK/bte/bta_hd_act.c +++ b/src/RVL_SDK/bte/bta_hd_act.c @@ -1,4 +1,4 @@ -#include "bta_hd_int.h" +#include /******************************************************************************* * headers @@ -6,18 +6,18 @@ #include -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "bd.h" -#include "bta_hd_api.h" -#include "bta_sys.h" -#include "btm_api.h" -#include "gki.h" -#include "hidd_api.h" -#include "hiddefs.h" -#include "sdp_api.h" +#include +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_hd_api.c b/src/RVL_SDK/bte/bta_hd_api.c index 34911933e..dff4b060a 100644 --- a/src/RVL_SDK/bte/bta_hd_api.c +++ b/src/RVL_SDK/bte/bta_hd_api.c @@ -1,4 +1,4 @@ -#include "bta_hd_api.h" +#include /******************************************************************************* * headers @@ -6,13 +6,13 @@ #include -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "bd.h" // bdcpy -#include "bta_hd_int.h" -#include "bta_sys.h" -#include "gki.h" +#include // bdcpy +#include +#include +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_hd_api.h b/src/RVL_SDK/bte/bta_hd_api.h index 68cd0dd2e..10f6f3297 100644 --- a/src/RVL_SDK/bte/bta_hd_api.h +++ b/src/RVL_SDK/bte/bta_hd_api.h @@ -10,10 +10,10 @@ * headers */ -#include +#include "macros.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_hd_cfg.c b/src/RVL_SDK/bte/bta_hd_cfg.c index 666477958..6753ae922 100644 --- a/src/RVL_SDK/bte/bta_hd_cfg.c +++ b/src/RVL_SDK/bte/bta_hd_cfg.c @@ -1,10 +1,10 @@ -#include "bta_hd_int.h" +#include /******************************************************************************* * headers */ -#include "data_types.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_hd_int.h b/src/RVL_SDK/bte/bta_hd_int.h index 9cf97a869..fcb7be8f7 100644 --- a/src/RVL_SDK/bte/bta_hd_int.h +++ b/src/RVL_SDK/bte/bta_hd_int.h @@ -10,14 +10,14 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "bta_hd_api.h" -#include "bta_sys.h" -#include "gki.h" -#include "hidd_api.h" -#include "hiddefs.h" +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_hd_main.c b/src/RVL_SDK/bte/bta_hd_main.c index b49f22030..bd4f75496 100644 --- a/src/RVL_SDK/bte/bta_hd_main.c +++ b/src/RVL_SDK/bte/bta_hd_main.c @@ -1,4 +1,4 @@ -#include "bta_hd_int.h" +#include /* References: * esp-idf @@ -11,15 +11,15 @@ #include -#include "bt_trace.h" -#include "bt_types.h" // BT_HDR -#include "data_types.h" +#include +#include // BT_HDR +#include -#include "bd.h" // bdcpy -#include "bta_hd_api.h" -#include "gki.h" // GKI_init_q -#include "hidd_api.h" -#include "hiddefs.h" +#include // bdcpy +#include +#include // GKI_init_q +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_hh_act.c b/src/RVL_SDK/bte/bta_hh_act.c index 550f72d02..ab0df9be3 100644 --- a/src/RVL_SDK/bte/bta_hh_act.c +++ b/src/RVL_SDK/bte/bta_hh_act.c @@ -1,4 +1,4 @@ -#include "bta_hh_int.h" +#include /* Original source: * bluedroid @@ -32,21 +32,21 @@ #include "revolution/types.h" #include -#include "bt_trace.h" -#include "bt_types.h" // BT_HDR -#include "data_types.h" +#include +#include // BT_HDR +#include -#include "bd.h" // bdcpy -#include "bta_hh_api.h" -#include "bta_hh_co.h" -#include "bta_sys.h" -#include "gki.h" // GKI_getbuf -#include "hiddefs.h" -#include "hidh_api.h" -#include "hidh_int.h" // hh_cb -#include "l2c_int.h" -#include "sdp_api.h" // SDP_SUCCESS -#include "utl.h" // utl_freebuf +#include // bdcpy +#include +#include +#include +#include // GKI_getbuf +#include +#include +#include // hh_cb +#include +#include // SDP_SUCCESS +#include // utl_freebuf /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/bta_hh_api.c b/src/RVL_SDK/bte/bta_hh_api.c index c86a5f954..359b78156 100644 --- a/src/RVL_SDK/bte/bta_hh_api.c +++ b/src/RVL_SDK/bte/bta_hh_api.c @@ -1,4 +1,4 @@ -#include "bta_hh_api.h" +#include /* Original source: * bluedroid @@ -32,16 +32,16 @@ #include "revolution/types.h" #include -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "bd.h" // bdcpy -#include "bta_api.h" // tBTA_SEC -#include "bta_hh_int.h" -#include "bta_sys.h" -#include "gki.h" -#include "hiddefs.h" +#include // bdcpy +#include // tBTA_SEC +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/bta_hh_api.h b/src/RVL_SDK/bte/bta_hh_api.h index a55a5349f..d76ae0960 100644 --- a/src/RVL_SDK/bte/bta_hh_api.h +++ b/src/RVL_SDK/bte/bta_hh_api.h @@ -30,12 +30,12 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "bta_api.h" -#include "hiddefs.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_hh_cfg.c b/src/RVL_SDK/bte/bta_hh_cfg.c index 1a1f9a9ec..17b00dbad 100644 --- a/src/RVL_SDK/bte/bta_hh_cfg.c +++ b/src/RVL_SDK/bte/bta_hh_cfg.c @@ -1,4 +1,4 @@ -#include "bta_hh_int.h" +#include /* Original source: * bluedroid diff --git a/src/RVL_SDK/bte/bta_hh_co.h b/src/RVL_SDK/bte/bta_hh_co.h index e3c8d5fd4..421fd9d08 100644 --- a/src/RVL_SDK/bte/bta_hh_co.h +++ b/src/RVL_SDK/bte/bta_hh_co.h @@ -30,9 +30,9 @@ * headers */ -#include "data_types.h" +#include -#include "bta_hh_api.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_hh_int.h b/src/RVL_SDK/bte/bta_hh_int.h index 8f4aa50f7..545b42ec8 100644 --- a/src/RVL_SDK/bte/bta_hh_int.h +++ b/src/RVL_SDK/bte/bta_hh_int.h @@ -30,14 +30,14 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "bta_api.h" -#include "bta_hh_api.h" -#include "bta_sys.h" -#include "hiddefs.h" -#include "sdp_api.h" +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_hh_main.c b/src/RVL_SDK/bte/bta_hh_main.c index da6358dd1..4f86807c4 100644 --- a/src/RVL_SDK/bte/bta_hh_main.c +++ b/src/RVL_SDK/bte/bta_hh_main.c @@ -1,4 +1,4 @@ -#include "bta_hh_int.h" +#include /* Original source: * bluedroid @@ -32,13 +32,13 @@ #include "revolution/types.h" #include -#include "bt_trace.h" -#include "bt_types.h" // BT_HDR -#include "data_types.h" +#include +#include // BT_HDR +#include -#include "bd.h" // bdcpy -#include "bta_hh_api.h" -#include "hiddefs.h" +#include // bdcpy +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_hh_utils.c b/src/RVL_SDK/bte/bta_hh_utils.c index 185fe49c9..aa84b568c 100644 --- a/src/RVL_SDK/bte/bta_hh_utils.c +++ b/src/RVL_SDK/bte/bta_hh_utils.c @@ -1,4 +1,4 @@ -#include "bta_hh_int.h" +#include /* Original source: * bluedroid @@ -32,15 +32,15 @@ #include "revolution/types.h" #include -#include "bt_trace.h" -#include "bt_types.h" // BD_ADDR -#include "data_types.h" +#include +#include // BD_ADDR +#include -#include "bd.h" -#include "bta_hh_api.h" -#include "gki.h" // GKI_getbuf -#include "hiddefs.h" // tHID_DEV_DSCP_INFO -#include "utl.h" // utl_freebuf +#include +#include +#include // GKI_getbuf +#include // tHID_DEV_DSCP_INFO +#include // utl_freebuf /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_pbc_cfg.c b/src/RVL_SDK/bte/bta_pbc_cfg.c index 0460c3150..194687314 100644 --- a/src/RVL_SDK/bte/bta_pbc_cfg.c +++ b/src/RVL_SDK/bte/bta_pbc_cfg.c @@ -1,10 +1,10 @@ -#include "bta_pbc_int.h" +#include /******************************************************************************* * headers */ -#include "bta_pbc_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_pbc_int.h b/src/RVL_SDK/bte/bta_pbc_int.h index 9f94d15da..3b9410a65 100644 --- a/src/RVL_SDK/bte/bta_pbc_int.h +++ b/src/RVL_SDK/bte/bta_pbc_int.h @@ -5,7 +5,7 @@ * headers */ -#include "bta_pbc_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_pbs_cfg.c b/src/RVL_SDK/bte/bta_pbs_cfg.c index b17b7c309..01fe3db17 100644 --- a/src/RVL_SDK/bte/bta_pbs_cfg.c +++ b/src/RVL_SDK/bte/bta_pbs_cfg.c @@ -1,4 +1,4 @@ -#include "bta_pbs_int.h" +#include /* Original source: * bluedroid @@ -29,9 +29,9 @@ * headers */ -#include "data_types.h" +#include -#include "bta_pbs_api.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_pbs_int.h b/src/RVL_SDK/bte/bta_pbs_int.h index 7dc8d69af..72b83aac6 100644 --- a/src/RVL_SDK/bte/bta_pbs_int.h +++ b/src/RVL_SDK/bte/bta_pbs_int.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_pr_cfg.c b/src/RVL_SDK/bte/bta_pr_cfg.c index 8393b07e1..f500f1e40 100644 --- a/src/RVL_SDK/bte/bta_pr_cfg.c +++ b/src/RVL_SDK/bte/bta_pr_cfg.c @@ -1,10 +1,10 @@ -#include "bta_pr_int.h" +#include /******************************************************************************* * headers */ -#include "bta_pr_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_pr_int.h b/src/RVL_SDK/bte/bta_pr_int.h index 67fede943..1c16c9f9f 100644 --- a/src/RVL_SDK/bte/bta_pr_int.h +++ b/src/RVL_SDK/bte/bta_pr_int.h @@ -5,7 +5,7 @@ * headers */ -#include "bta_pr_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_prm_api.c b/src/RVL_SDK/bte/bta_prm_api.c index d8dbbd202..25d8cf848 100644 --- a/src/RVL_SDK/bte/bta_prm_api.c +++ b/src/RVL_SDK/bte/bta_prm_api.c @@ -1,4 +1,4 @@ -#include "bta_prm_api.h" +#include /******************************************************************************* * headers @@ -6,11 +6,11 @@ #include -#include "data_types.h" // UINT8 +#include // UINT8 -#include "bta_prm_int.h" -#include "bta_sys.h" -#include "gki.h" +#include +#include +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_prm_api.h b/src/RVL_SDK/bte/bta_prm_api.h index e6c254c96..7e165f4b0 100644 --- a/src/RVL_SDK/bte/bta_prm_api.h +++ b/src/RVL_SDK/bte/bta_prm_api.h @@ -5,7 +5,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_prm_int.h b/src/RVL_SDK/bte/bta_prm_int.h index a21f85465..8d7138c4f 100644 --- a/src/RVL_SDK/bte/bta_prm_int.h +++ b/src/RVL_SDK/bte/bta_prm_int.h @@ -5,11 +5,11 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "bta_prm_api.h" -#include "bta_sys.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_prm_main.c b/src/RVL_SDK/bte/bta_prm_main.c index c3d5091ea..6b064554b 100644 --- a/src/RVL_SDK/bte/bta_prm_main.c +++ b/src/RVL_SDK/bte/bta_prm_main.c @@ -1,4 +1,4 @@ -#include "bta_prm_int.h" +#include /******************************************************************************* * headers @@ -6,15 +6,15 @@ #include -#include "BCM2045.h" +#include -#include "bt_trace.h" -#include "bt_types.h" // BT_HDR -#include "data_types.h" +#include +#include // BT_HDR +#include -#include "bta_fs_co.h" -#include "bta_sys.h" // bta_sys_sendmsg -#include "gki.h" +#include +#include // bta_sys_sendmsg +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/bta_ss_cfg.c b/src/RVL_SDK/bte/bta_ss_cfg.c index a26ee8867..bba16f9f5 100644 --- a/src/RVL_SDK/bte/bta_ss_cfg.c +++ b/src/RVL_SDK/bte/bta_ss_cfg.c @@ -1,10 +1,10 @@ -#include "bta_ss_int.h" +#include /******************************************************************************* * headers */ -#include "bta_ss_api.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bta_ss_int.h b/src/RVL_SDK/bte/bta_ss_int.h index ccd3d7d99..08b060cc4 100644 --- a/src/RVL_SDK/bte/bta_ss_int.h +++ b/src/RVL_SDK/bte/bta_ss_int.h @@ -5,7 +5,7 @@ * headers */ -#include "bta_ss_api.h" +#include /******************************************************************************* * external globals diff --git a/src/RVL_SDK/bte/bta_sys.h b/src/RVL_SDK/bte/bta_sys.h index ff5621039..a5ea09a2e 100644 --- a/src/RVL_SDK/bte/bta_sys.h +++ b/src/RVL_SDK/bte/bta_sys.h @@ -30,10 +30,10 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "gki.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_sys_cfg.c b/src/RVL_SDK/bte/bta_sys_cfg.c index b3fab82dc..4140a8563 100644 --- a/src/RVL_SDK/bte/bta_sys_cfg.c +++ b/src/RVL_SDK/bte/bta_sys_cfg.c @@ -1,4 +1,4 @@ -#include "bta_sys_int.h" +#include /* Original source: * bluedroid @@ -29,9 +29,9 @@ * headers */ -#include "bt_trace.h" +#include -#include "gki.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bta_sys_conn.c b/src/RVL_SDK/bte/bta_sys_conn.c index b218a371a..cc1992693 100644 --- a/src/RVL_SDK/bte/bta_sys_conn.c +++ b/src/RVL_SDK/bte/bta_sys_conn.c @@ -1,4 +1,4 @@ -#include "bta_sys.h" +#include /* Original source: * bluedroid @@ -29,10 +29,10 @@ * headers */ -#include "bt_types.h" // BD_ADDR -#include "data_types.h" // UINT8 +#include // BD_ADDR +#include // UINT8 -#include "bta_sys_int.h" // bta_sys_cb +#include // bta_sys_cb /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/bta_sys_int.h b/src/RVL_SDK/bte/bta_sys_int.h index 06483c495..ceda8416b 100644 --- a/src/RVL_SDK/bte/bta_sys_int.h +++ b/src/RVL_SDK/bte/bta_sys_int.h @@ -30,10 +30,10 @@ * headers */ -#include "data_types.h" +#include -#include "bta_sys.h" -#include "ptim.h" +#include +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bta_sys_main.c b/src/RVL_SDK/bte/bta_sys_main.c index 4e3b3fb9c..829a6ee95 100644 --- a/src/RVL_SDK/bte/bta_sys_main.c +++ b/src/RVL_SDK/bte/bta_sys_main.c @@ -1,4 +1,4 @@ -#include "bta_sys_int.h" +#include /* Original source: * bluedroid @@ -31,14 +31,14 @@ #include -#include "bt_trace.h" -#include "bt_types.h" // BT_HDR -#include "data_types.h" +#include +#include // BT_HDR +#include -#include "bta_dm_int.h" -#include "bta_sys.h" -#include "gki.h" -#include "ptim.h" +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bte.h b/src/RVL_SDK/bte/bte.h index 5e809418b..d8a671680 100644 --- a/src/RVL_SDK/bte/bte.h +++ b/src/RVL_SDK/bte/bte.h @@ -30,11 +30,11 @@ * headers */ -#include +#include "decomp.h" -#include "data_types.h" +#include -#include "hci.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bte_hcisu.c b/src/RVL_SDK/bte/bte_hcisu.c index 3eaaf9729..88c34cd7d 100644 --- a/src/RVL_SDK/bte/bte_hcisu.c +++ b/src/RVL_SDK/bte/bte_hcisu.c @@ -1,17 +1,17 @@ -#include "bte.h" +#include /******************************************************************************* * headers */ -#include // unk_t +#include "decomp.h" // unk_t -#include "data_types.h" // UINT16 -#include "gki_target.h" // BTU_TASK +#include // UINT16 +#include // BTU_TASK -#include "btu.h" // BTU_HCI_RCV_MBOX -#include "gki.h" -#include "hci.h" +#include // BTU_HCI_RCV_MBOX +#include +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/bte_init.c b/src/RVL_SDK/bte/bte_init.c index ec6dbadf0..3568de8f0 100644 --- a/src/RVL_SDK/bte/bte_init.c +++ b/src/RVL_SDK/bte/bte_init.c @@ -1,4 +1,4 @@ -#include "bte.h" +#include /* Original source: * bluedroid @@ -29,10 +29,10 @@ * headers */ -#include "gap_api.h" // GAP_Init -#include "hidd_api.h" // HID_DevInit -#include "hidh_api.h" // HID_HostInit -#include "port_api.h" // RFCOMM_Init +#include // GAP_Init +#include // HID_DevInit +#include // HID_HostInit +#include // RFCOMM_Init /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/bte_load.c b/src/RVL_SDK/bte/bte_load.c index 0a3b2793b..9a7045631 100644 --- a/src/RVL_SDK/bte/bte_load.c +++ b/src/RVL_SDK/bte/bte_load.c @@ -1,4 +1,4 @@ -#include "bte.h" +#include /******************************************************************************* * headers @@ -6,9 +6,9 @@ #include // NULL -#include "data_types.h" // UINT32 +#include // UINT32 -#include "gki.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/bte_logmsg.c b/src/RVL_SDK/bte/bte_logmsg.c index 09c3a3701..bb3194615 100644 --- a/src/RVL_SDK/bte/bte_logmsg.c +++ b/src/RVL_SDK/bte/bte_logmsg.c @@ -1,4 +1,4 @@ -#include "bte.h" +#include /* Original source: * bluedroid @@ -32,11 +32,11 @@ #include // #include -#include "bt_trace.h" -#include "data_types.h" // UINT32 +#include +#include // UINT32 #define IS_BTE -#include +#include "context_rvl.h" /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/bte_main.c b/src/RVL_SDK/bte/bte_main.c index d809316cb..5fd1d52bc 100644 --- a/src/RVL_SDK/bte/bte_main.c +++ b/src/RVL_SDK/bte/bte_main.c @@ -1,4 +1,4 @@ -#include "bte.h" +#include /* Original source: * bluedroid @@ -31,18 +31,18 @@ #include // NULL -#include // ATTR_ALIGN +#include "macros.h" // ATTR_ALIGN -#include "data_types.h" +#include -#include "bta_api.h" -#include "btu.h" -#include "gki.h" -#include "hci.h" -#include "uusb.h" // wait4hci +#include +#include +#include +#include +#include // wait4hci #define IS_BTE -#include +#include "context_rvl.h" /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/bte_version.c b/src/RVL_SDK/bte/bte_version.c index 112b4c48f..779a07e02 100644 --- a/src/RVL_SDK/bte/bte_version.c +++ b/src/RVL_SDK/bte/bte_version.c @@ -1,4 +1,4 @@ -#include "bte.h" +#include /* Original source: * bluedroid diff --git a/src/RVL_SDK/bte/btm_acl.c b/src/RVL_SDK/bte/btm_acl.c index b3fa5c610..277efab5e 100644 --- a/src/RVL_SDK/bte/btm_acl.c +++ b/src/RVL_SDK/bte/btm_acl.c @@ -1,4 +1,4 @@ -#include "btm_api.h" +#include /* Original source: * bluedroid @@ -32,17 +32,17 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_int.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" -#include "l2c_int.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/btm_api.h b/src/RVL_SDK/bte/btm_api.h index 6af5cf909..98d3d60be 100644 --- a/src/RVL_SDK/bte/btm_api.h +++ b/src/RVL_SDK/bte/btm_api.h @@ -30,13 +30,13 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" +#include +#include -#include "data_types.h" +#include -#include "hcidefs.h" -#include "sdp_api.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/btm_dev.c b/src/RVL_SDK/bte/btm_dev.c index 2f68b87d2..1173e970a 100644 --- a/src/RVL_SDK/bte/btm_dev.c +++ b/src/RVL_SDK/bte/btm_dev.c @@ -1,4 +1,4 @@ -#include "btm_api.h" +#include /* Original source: * bluedroid @@ -29,14 +29,14 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include #include "revolution/types.h" #include -#include "btm_int.h" -#include "hcidefs.h" // tHCI_HANDLE +#include +#include // tHCI_HANDLE /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/btm_devctl.c b/src/RVL_SDK/bte/btm_devctl.c index 0bb7ece49..69acf8b09 100644 --- a/src/RVL_SDK/bte/btm_devctl.c +++ b/src/RVL_SDK/bte/btm_devctl.c @@ -1,4 +1,4 @@ -#include "btm_api.h" +#include /* Original source: * bluedroid @@ -32,17 +32,17 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_int.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" -#include "l2c_int.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/btm_discovery.c b/src/RVL_SDK/bte/btm_discovery.c index e41753857..d8bd7cbca 100644 --- a/src/RVL_SDK/bte/btm_discovery.c +++ b/src/RVL_SDK/bte/btm_discovery.c @@ -1,4 +1,4 @@ -#include "btm_api.h" +#include /******************************************************************************* * headers @@ -8,14 +8,14 @@ #include #include -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "btm_int.h" -#include "btu.h" // btu_stop_timer -#include "sdp_api.h" -#include "sdpdefs.h" // UUID_SERVCLASS_PUBLIC_BROWSE_GROUP +#include +#include // btu_stop_timer +#include +#include // UUID_SERVCLASS_PUBLIC_BROWSE_GROUP /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/btm_inq.c b/src/RVL_SDK/bte/btm_inq.c index 9fb961735..90d500304 100644 --- a/src/RVL_SDK/bte/btm_inq.c +++ b/src/RVL_SDK/bte/btm_inq.c @@ -1,4 +1,4 @@ -#include "btm_api.h" +#include /* Original source: * bluedroid @@ -33,19 +33,19 @@ #include #include -#include // BOOLIFY_TERNARY +#include "macros.h" // BOOLIFY_TERNARY -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" -#include "gki_target.h" // GKI_MAX_BUF_SIZE +#include +#include +#include +#include +#include // GKI_MAX_BUF_SIZE -#include "btm_int.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" +#include +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/btm_int.h b/src/RVL_SDK/bte/btm_int.h index 37d61557c..ea84950d1 100644 --- a/src/RVL_SDK/bte/btm_int.h +++ b/src/RVL_SDK/bte/btm_int.h @@ -30,16 +30,16 @@ * headers */ -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_api.h" -#include "gki.h" -#include "hcidefs.h" -#include "rfcdefs.h" -#include "sdp_api.h" +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/btm_main.c b/src/RVL_SDK/bte/btm_main.c index fbaa90d73..b71973c74 100644 --- a/src/RVL_SDK/bte/btm_main.c +++ b/src/RVL_SDK/bte/btm_main.c @@ -1,4 +1,4 @@ -#include "btm_int.h" +#include /* Original source: * bluedroid @@ -31,9 +31,9 @@ #include // memset -#include "bt_trace.h" +#include -#include "btm_api.h" // BTM_SEC_MODE_SERVICE +#include // BTM_SEC_MODE_SERVICE /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/btm_pm.c b/src/RVL_SDK/bte/btm_pm.c index 06bab147a..4a07ab6de 100644 --- a/src/RVL_SDK/bte/btm_pm.c +++ b/src/RVL_SDK/bte/btm_pm.c @@ -1,4 +1,4 @@ -#include "btm_api.h" +#include /* Original source: * bluedroid @@ -32,15 +32,15 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_int.h" -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/btm_sco.c b/src/RVL_SDK/bte/btm_sco.c index 7a8052b4f..9f7f25d6e 100644 --- a/src/RVL_SDK/bte/btm_sco.c +++ b/src/RVL_SDK/bte/btm_sco.c @@ -1,4 +1,4 @@ -#include "btm_api.h" +#include /* Original source: * bluedroid @@ -32,15 +32,15 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_int.h" -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" +#include +#include +#include +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/btm_sec.c b/src/RVL_SDK/bte/btm_sec.c index f981bf437..985aaed30 100644 --- a/src/RVL_SDK/bte/btm_sec.c +++ b/src/RVL_SDK/bte/btm_sec.c @@ -1,4 +1,4 @@ -#include "btm_api.h" +#include /* Original source: * bluedroid @@ -32,17 +32,17 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_int.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" -#include "l2c_int.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/btu.h b/src/RVL_SDK/bte/btu.h index f1fe9e158..0a8a73341 100644 --- a/src/RVL_SDK/bte/btu.h +++ b/src/RVL_SDK/bte/btu.h @@ -30,10 +30,10 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "gki.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/btu_hcif.c b/src/RVL_SDK/bte/btu_hcif.c index 001b09815..50f184f0f 100644 --- a/src/RVL_SDK/bte/btu_hcif.c +++ b/src/RVL_SDK/bte/btu_hcif.c @@ -1,4 +1,4 @@ -#include "btu.h" +#include /* Original source: * bluedroid @@ -29,20 +29,20 @@ * headers */ -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include #include "revolution/types.h" #include -#include "btm_api.h" -#include "btm_int.h" -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" -#include "hidd_int.h" -#include "l2c_int.h" +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/btu_init.c b/src/RVL_SDK/bte/btu_init.c index 0841cf232..d63070a3b 100644 --- a/src/RVL_SDK/bte/btu_init.c +++ b/src/RVL_SDK/bte/btu_init.c @@ -1,4 +1,4 @@ -#include "btu.h" +#include /* Original source: * bluedroid @@ -32,13 +32,13 @@ #include "revolution/types.h" #include -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "btm_int.h" -#include "hcidefs.h" -#include "l2c_int.h" -#include "sdp_int.h" +#include +#include +#include +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/btu_task1.c b/src/RVL_SDK/bte/btu_task1.c index 9e8a7fb2d..d6ebf1554 100644 --- a/src/RVL_SDK/bte/btu_task1.c +++ b/src/RVL_SDK/bte/btu_task1.c @@ -1,14 +1,14 @@ -#include "bt_types.h" -#include "bta_sys.h" -#include "bte.h" -#include "btm_int.h" -#include "btu.h" -#include "gki_target.h" -#include "hidh_int.h" -#include "l2c_int.h" -#include "rfc_int.h" -#include "sdp_int.h" -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "revolution/os.h" tBTU_CB btu_cb; diff --git a/src/RVL_SDK/bte/gap_api.c b/src/RVL_SDK/bte/gap_api.c index 20ee200c8..e62626f15 100644 --- a/src/RVL_SDK/bte/gap_api.c +++ b/src/RVL_SDK/bte/gap_api.c @@ -1,4 +1,4 @@ -#include "gap_api.h" +#include /* Original source: * bluedroid @@ -32,15 +32,15 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_api.h" -#include "gap_int.h" -#include "profiles_api.h" -#include "sdp_api.h" +#include +#include +#include +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/gap_api.h b/src/RVL_SDK/bte/gap_api.h index 151daa8bf..0559fef90 100644 --- a/src/RVL_SDK/bte/gap_api.h +++ b/src/RVL_SDK/bte/gap_api.h @@ -32,11 +32,11 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "btm_api.h" -#include "profiles_api.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/gap_conn.c b/src/RVL_SDK/bte/gap_conn.c index 0dec4ec78..fc443a078 100644 --- a/src/RVL_SDK/bte/gap_conn.c +++ b/src/RVL_SDK/bte/gap_conn.c @@ -1,4 +1,4 @@ -#include "gap_int.h" +#include /* Original source: * bluedroid @@ -32,18 +32,18 @@ #include #include // NULL -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_api.h" -#include "btu.h" -#include "gap_api.h" -#include "gki.h" -#include "l2c_api.h" -#include "l2cdefs.h" -#include "profiles_api.h" +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/gap_int.h b/src/RVL_SDK/bte/gap_int.h index 2d9db5ae3..7b77459e5 100644 --- a/src/RVL_SDK/bte/gap_int.h +++ b/src/RVL_SDK/bte/gap_int.h @@ -32,15 +32,15 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "btm_api.h" -#include "btm_int.h" -#include "gap_api.h" -#include "gki.h" -#include "l2c_api.h" +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/gap_utils.c b/src/RVL_SDK/bte/gap_utils.c index a1f58dfa1..e208d7fc0 100644 --- a/src/RVL_SDK/bte/gap_utils.c +++ b/src/RVL_SDK/bte/gap_utils.c @@ -1,4 +1,4 @@ -#include "gap_int.h" +#include /* Original source: * bluedroid @@ -32,15 +32,15 @@ #include "revolution/types.h" #include -#include +#include "macros.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "btm_api.h" -#include "gap_api.h" -#include "profiles_api.h" +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/gki.h b/src/RVL_SDK/bte/gki.h index c8dbeefd9..34687d261 100644 --- a/src/RVL_SDK/bte/gki.h +++ b/src/RVL_SDK/bte/gki.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/gki_buffer.c b/src/RVL_SDK/bte/gki_buffer.c index bca03096e..9a284660b 100644 --- a/src/RVL_SDK/bte/gki_buffer.c +++ b/src/RVL_SDK/bte/gki_buffer.c @@ -1,4 +1,4 @@ -#include "gki.h" +#include /* Original source: * bluedroid @@ -31,11 +31,11 @@ #include -#include "data_types.h" -#include "gki_target.h" +#include +#include -#include "gki_common.h" -#include "gki_int.h" +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/gki_common.h b/src/RVL_SDK/bte/gki_common.h index aa95162d2..31668643b 100644 --- a/src/RVL_SDK/bte/gki_common.h +++ b/src/RVL_SDK/bte/gki_common.h @@ -30,10 +30,10 @@ * headers */ -#include "data_types.h" -#include "gki_target.h" +#include +#include -#include "gki.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/gki_int.h b/src/RVL_SDK/bte/gki_int.h index b3fbd2a50..ab80710bd 100644 --- a/src/RVL_SDK/bte/gki_int.h +++ b/src/RVL_SDK/bte/gki_int.h @@ -30,9 +30,9 @@ * headers */ -#include "data_types.h" +#include -#include "gki_common.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/gki_ppc.c b/src/RVL_SDK/bte/gki_ppc.c index aba6b1287..392a9d131 100644 --- a/src/RVL_SDK/bte/gki_ppc.c +++ b/src/RVL_SDK/bte/gki_ppc.c @@ -1,4 +1,4 @@ -#include "gki.h" +#include /* Original source: * bluedroid @@ -32,17 +32,17 @@ #include #include -#include "data_types.h" -#include "gki_target.h" +#include +#include -#include "gki_common.h" -#include "gki_int.h" +#include +#include -#include -#include +#include "revolution/os.h" +#include "revolution/types.h" #define IS_BTE -#include +#include "context_rvl.h" /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/gki_time.c b/src/RVL_SDK/bte/gki_time.c index cf959a6c2..c076a6025 100644 --- a/src/RVL_SDK/bte/gki_time.c +++ b/src/RVL_SDK/bte/gki_time.c @@ -1,4 +1,4 @@ -#include "gki.h" +#include /* Original source: * bluedroid @@ -31,11 +31,11 @@ #include -#include "data_types.h" -#include "gki_target.h" +#include +#include -#include "gki_common.h" -#include "gki_int.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/goep_api.h b/src/RVL_SDK/bte/goep_api.h index 22c6d9e3b..29f5f9d22 100644 --- a/src/RVL_SDK/bte/goep_api.h +++ b/src/RVL_SDK/bte/goep_api.h @@ -5,7 +5,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/goep_fs.c b/src/RVL_SDK/bte/goep_fs.c index a9f4edcea..b095730fd 100644 --- a/src/RVL_SDK/bte/goep_fs.c +++ b/src/RVL_SDK/bte/goep_fs.c @@ -1,4 +1,4 @@ -#include "goep_fs.h" +#include /******************************************************************************* * headers @@ -6,10 +6,10 @@ #include // memset -#include "gki_target.h" // PPC_TASK -#include "data_types.h" +#include // PPC_TASK +#include -#include "gki.h" +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/goep_fs.h b/src/RVL_SDK/bte/goep_fs.h index 465f934e0..98b041bc2 100644 --- a/src/RVL_SDK/bte/goep_fs.h +++ b/src/RVL_SDK/bte/goep_fs.h @@ -30,8 +30,8 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/goep_int.h b/src/RVL_SDK/bte/goep_int.h index 0736ae0b9..848ec9d78 100644 --- a/src/RVL_SDK/bte/goep_int.h +++ b/src/RVL_SDK/bte/goep_int.h @@ -5,7 +5,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/goep_trace.c b/src/RVL_SDK/bte/goep_trace.c index a932320f2..21e8a1c99 100644 --- a/src/RVL_SDK/bte/goep_trace.c +++ b/src/RVL_SDK/bte/goep_trace.c @@ -1,4 +1,4 @@ -#include "goep_api.h" +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/goep_util.c b/src/RVL_SDK/bte/goep_util.c index 09a4fc207..632fb14cb 100644 --- a/src/RVL_SDK/bte/goep_util.c +++ b/src/RVL_SDK/bte/goep_util.c @@ -1,4 +1,4 @@ -#include "goep_api.h" +#include /******************************************************************************* * headers @@ -6,19 +6,19 @@ #include -#include // ARRAY_LENGTH +#include "macros.h" // ARRAY_LENGTH -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" -#include "gki_target.h" // PPC_TASK -#include "wcassert.h" // WCAssert_Line +#include +#include +#include +#include // PPC_TASK +#include // WCAssert_Line -#include "btm_api.h" // BTM_SetSecurityLevel -#include "gki.h" -#include "goep_int.h" -#include "sdp_api.h" -#include "sdpdefs.h" +#include // BTM_SetSecurityLevel +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/hci.h b/src/RVL_SDK/bte/hci.h index 3da6705b8..5c0099eed 100644 --- a/src/RVL_SDK/bte/hci.h +++ b/src/RVL_SDK/bte/hci.h @@ -30,9 +30,9 @@ * headers */ -#include +#include "decomp.h" -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/hcicmds.c b/src/RVL_SDK/bte/hcicmds.c index 43860a317..a420e4682 100644 --- a/src/RVL_SDK/bte/hcicmds.c +++ b/src/RVL_SDK/bte/hcicmds.c @@ -1,4 +1,4 @@ -#include "hcimsgs.h" +#include /* Original source: * bluedroid @@ -32,14 +32,14 @@ #include "revolution/types.h" #include -#include // ARRAY_LENGTH +#include "macros.h" // ARRAY_LENGTH -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "btu.h" -#include "hcidefs.h" +#include +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/hcidefs.h b/src/RVL_SDK/bte/hcidefs.h index c32eedd10..48c10bb21 100644 --- a/src/RVL_SDK/bte/hcidefs.h +++ b/src/RVL_SDK/bte/hcidefs.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/hcimsgs.h b/src/RVL_SDK/bte/hcimsgs.h index 705e8e118..6a1f441cb 100644 --- a/src/RVL_SDK/bte/hcimsgs.h +++ b/src/RVL_SDK/bte/hcimsgs.h @@ -30,8 +30,8 @@ * headers */ -#include "data_types.h" -#include "bt_types.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/hcisu_h2.c b/src/RVL_SDK/bte/hcisu_h2.c index 264cd403e..529ecc18d 100644 --- a/src/RVL_SDK/bte/hcisu_h2.c +++ b/src/RVL_SDK/bte/hcisu_h2.c @@ -1,4 +1,4 @@ -#include "hci.h" +#include /* Original source: * bluedroid @@ -31,18 +31,18 @@ #include -#include +#include "decomp.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" -#include "gki_target.h" +#include +#include +#include +#include -#include "btu.h" -#include "gki.h" -#include "l2c_int.h" -#include "misc.h" -#include "uusb.h" +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/hid_conn.h b/src/RVL_SDK/bte/hid_conn.h index 10051df8b..d397c2ee7 100644 --- a/src/RVL_SDK/bte/hid_conn.h +++ b/src/RVL_SDK/bte/hid_conn.h @@ -30,9 +30,9 @@ * headers */ -#include "data_types.h" +#include -#include "gki.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/hidd_api.c b/src/RVL_SDK/bte/hidd_api.c index 0029a4235..565420587 100644 --- a/src/RVL_SDK/bte/hidd_api.c +++ b/src/RVL_SDK/bte/hidd_api.c @@ -1,4 +1,4 @@ -#include "hidd_api.h" +#include /******************************************************************************* * headers @@ -7,18 +7,18 @@ #include "revolution/types.h" #include -#include // ARRAY_LENGTH +#include "macros.h" // ARRAY_LENGTH -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" -#include "wcassert.h" // WCAssert_Line +#include +#include +#include +#include // WCAssert_Line -#include "btm_api.h" -#include "gki.h" -#include "hidd_int.h" -#include "hiddefs.h" -#include "sdp_api.h" +#include +#include +#include +#include +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/hidd_api.h b/src/RVL_SDK/bte/hidd_api.h index e17f49f71..e75ebb9cd 100644 --- a/src/RVL_SDK/bte/hidd_api.h +++ b/src/RVL_SDK/bte/hidd_api.h @@ -5,10 +5,10 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "hiddefs.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/hidd_conn.c b/src/RVL_SDK/bte/hidd_conn.c index 4c258e495..d5240bc72 100644 --- a/src/RVL_SDK/bte/hidd_conn.c +++ b/src/RVL_SDK/bte/hidd_conn.c @@ -1,4 +1,4 @@ -#include "hidd_int.h" +#include /******************************************************************************* * headers @@ -7,17 +7,17 @@ #include "revolution/types.h" #include -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "btm_api.h" // BTM_SetQoS -#include "btm_int.h" -#include "gki.h" // GKI_freebuf -#include "hid_conn.h" -#include "hidd_api.h" -#include "hiddefs.h" -#include "l2c_api.h" +#include // BTM_SetQoS +#include +#include // GKI_freebuf +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/hidd_int.h b/src/RVL_SDK/bte/hidd_int.h index 52c6f28f7..cbd79d079 100644 --- a/src/RVL_SDK/bte/hidd_int.h +++ b/src/RVL_SDK/bte/hidd_int.h @@ -5,14 +5,14 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "gki.h" -#include "hiddefs.h" -#include "hidd_api.h" -#include "hid_conn.h" -#include "l2c_api.h" +#include +#include +#include +#include +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/hidd_mgmt.c b/src/RVL_SDK/bte/hidd_mgmt.c index c80c30351..4e7e453e6 100644 --- a/src/RVL_SDK/bte/hidd_mgmt.c +++ b/src/RVL_SDK/bte/hidd_mgmt.c @@ -1,4 +1,4 @@ -#include "hidd_int.h" +#include /******************************************************************************* * headers @@ -7,13 +7,13 @@ #include "revolution/types.h" #include -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "btu.h" -#include "hidd_api.h" -#include "hiddefs.h" +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/hidd_pm.c b/src/RVL_SDK/bte/hidd_pm.c index 16ff3f1de..a02b05e36 100644 --- a/src/RVL_SDK/bte/hidd_pm.c +++ b/src/RVL_SDK/bte/hidd_pm.c @@ -1,4 +1,4 @@ -#include "hidd_int.h" +#include /******************************************************************************* * headers @@ -7,14 +7,14 @@ #include "revolution/types.h" #include -#include +#include "macros.h" -#include "data_types.h" +#include -#include "btm_api.h" -#include "btu.h" -#include "gki.h" -#include "hidd_api.h" +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/hiddefs.h b/src/RVL_SDK/bte/hiddefs.h index 8a21a52a0..57cfa2989 100644 --- a/src/RVL_SDK/bte/hiddefs.h +++ b/src/RVL_SDK/bte/hiddefs.h @@ -30,10 +30,10 @@ * headers */ -#include "bt_target.h" -#include "data_types.h" +#include +#include -#include "sdp_api.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/hidh_api.c b/src/RVL_SDK/bte/hidh_api.c index fbecdd1af..484b0d8d7 100644 --- a/src/RVL_SDK/bte/hidh_api.c +++ b/src/RVL_SDK/bte/hidh_api.c @@ -1,4 +1,4 @@ -#include "hidh_api.h" +#include /* Original source: * bluedroid @@ -32,19 +32,19 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_api.h" -#include "btu.h" -#include "gki.h" -#include "hid_conn.h" -#include "hiddefs.h" -#include "hidh_int.h" -#include "sdp_api.h" -#include "sdpdefs.h" +#include +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/hidh_api.h b/src/RVL_SDK/bte/hidh_api.h index de4526c0e..537e4a7c3 100644 --- a/src/RVL_SDK/bte/hidh_api.h +++ b/src/RVL_SDK/bte/hidh_api.h @@ -30,11 +30,11 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "hiddefs.h" -#include "sdp_api.h" +#include +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/hidh_conn.c b/src/RVL_SDK/bte/hidh_conn.c index bb6f6d5ac..76fd3e415 100644 --- a/src/RVL_SDK/bte/hidh_conn.c +++ b/src/RVL_SDK/bte/hidh_conn.c @@ -1,4 +1,4 @@ -#include "hidh_int.h" +#include /* Original source: * bluedroid @@ -32,21 +32,21 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_api.h" -#include "btm_int.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "hid_conn.h" -#include "hiddefs.h" -#include "hidh_api.h" -#include "l2c_api.h" -#include "l2cdefs.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/hidh_int.h b/src/RVL_SDK/bte/hidh_int.h index 8466710e1..6a1bd2d75 100644 --- a/src/RVL_SDK/bte/hidh_int.h +++ b/src/RVL_SDK/bte/hidh_int.h @@ -30,16 +30,16 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "gki.h" -#include "hid_conn.h" -#include "hiddefs.h" -#include "hidh_api.h" -#include "l2c_api.h" -#include "sdp_api.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/l2c_api.c b/src/RVL_SDK/bte/l2c_api.c index 801210fd4..4cdd432d0 100644 --- a/src/RVL_SDK/bte/l2c_api.c +++ b/src/RVL_SDK/bte/l2c_api.c @@ -1,4 +1,4 @@ -#include "l2c_api.h" +#include /* Original source: * bluedroid @@ -32,19 +32,19 @@ #include #include -#include +#include "decomp.h" -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_api.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "l2c_int.h" -#include "l2cdefs.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/l2c_api.h b/src/RVL_SDK/bte/l2c_api.h index d3d20042f..a3cfa75ae 100644 --- a/src/RVL_SDK/bte/l2c_api.h +++ b/src/RVL_SDK/bte/l2c_api.h @@ -30,8 +30,8 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/l2c_csm.c b/src/RVL_SDK/bte/l2c_csm.c index 03db06d8b..68c1e3d47 100644 --- a/src/RVL_SDK/bte/l2c_csm.c +++ b/src/RVL_SDK/bte/l2c_csm.c @@ -1,4 +1,4 @@ -#include "l2c_int.h" +#include /* Original source: * bluedroid @@ -31,17 +31,17 @@ #include -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "btm_api.h" -#include "btm_int.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "l2c_api.h" -#include "l2cdefs.h" +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/l2c_int.h b/src/RVL_SDK/bte/l2c_int.h index 82797cfbf..68260da8a 100644 --- a/src/RVL_SDK/bte/l2c_int.h +++ b/src/RVL_SDK/bte/l2c_int.h @@ -30,12 +30,12 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "gki.h" -#include "l2c_api.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/l2c_link.c b/src/RVL_SDK/bte/l2c_link.c index a65f297a3..1ac6dd35b 100644 --- a/src/RVL_SDK/bte/l2c_link.c +++ b/src/RVL_SDK/bte/l2c_link.c @@ -1,4 +1,4 @@ -#include "l2c_int.h" +#include /* Original source: * bluedroid @@ -32,19 +32,19 @@ #include #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_api.h" -#include "btm_int.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" -#include "l2c_api.h" -#include "l2cdefs.h" +#include +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/l2c_main.c b/src/RVL_SDK/bte/l2c_main.c index cc0aa0dc5..e25a7f273 100644 --- a/src/RVL_SDK/bte/l2c_main.c +++ b/src/RVL_SDK/bte/l2c_main.c @@ -1,4 +1,4 @@ -#include "l2c_int.h" +#include /* Original source: * bluedroid @@ -32,18 +32,18 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_int.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "hcimsgs.h" -#include "l2c_api.h" -#include "l2cdefs.h" +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/l2c_utils.c b/src/RVL_SDK/bte/l2c_utils.c index 29ce1ecb6..d6e4f0948 100644 --- a/src/RVL_SDK/bte/l2c_utils.c +++ b/src/RVL_SDK/bte/l2c_utils.c @@ -1,4 +1,4 @@ -#include "l2c_int.h" +#include /* Original source: * bluedroid @@ -32,19 +32,19 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" -#include "gki_target.h" +#include +#include +#include +#include +#include -#include "btm_api.h" -#include "btm_int.h" -#include "btu.h" -#include "gki.h" -#include "hcimsgs.h" -#include "l2c_api.h" -#include "l2cdefs.h" +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/misc.h b/src/RVL_SDK/bte/misc.h index 0c56bf44d..89868f2ac 100644 --- a/src/RVL_SDK/bte/misc.h +++ b/src/RVL_SDK/bte/misc.h @@ -7,7 +7,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/port_api.c b/src/RVL_SDK/bte/port_api.c index f4cfaffb0..401eb2c60 100644 --- a/src/RVL_SDK/bte/port_api.c +++ b/src/RVL_SDK/bte/port_api.c @@ -1,4 +1,4 @@ -#include "port_api.h" +#include /* Original source: * bluedroid @@ -32,17 +32,17 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "gki.h" -#include "l2c_api.h" -#include "port_int.h" -#include "rfc_int.h" -#include "rfcdefs.h" -#include "sdpdefs.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/port_api.h b/src/RVL_SDK/bte/port_api.h index 547e68517..eef8c1723 100644 --- a/src/RVL_SDK/bte/port_api.h +++ b/src/RVL_SDK/bte/port_api.h @@ -30,10 +30,10 @@ * headers */ -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "profiles_api.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/port_int.h b/src/RVL_SDK/bte/port_int.h index 93cd09db0..e79e1bb3e 100644 --- a/src/RVL_SDK/bte/port_int.h +++ b/src/RVL_SDK/bte/port_int.h @@ -30,13 +30,13 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "gki.h" -#include "port_api.h" -#include "rfcdefs.h" +#include +#include +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/port_rfc.c b/src/RVL_SDK/bte/port_rfc.c index fb0ad5c94..73bf83292 100644 --- a/src/RVL_SDK/bte/port_rfc.c +++ b/src/RVL_SDK/bte/port_rfc.c @@ -1,4 +1,4 @@ -#include "port_int.h" +#include /* Original source: * bluedroid @@ -32,17 +32,17 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "gki.h" -#include "hcidefs.h" -#include "port_api.h" -#include "rfc_int.h" -#include "rfcdefs.h" -#include "sdpdefs.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/port_utils.c b/src/RVL_SDK/bte/port_utils.c index 9c62c49c3..424573440 100644 --- a/src/RVL_SDK/bte/port_utils.c +++ b/src/RVL_SDK/bte/port_utils.c @@ -1,4 +1,4 @@ -#include "port_int.h" +#include /* Original source: * bluedroid @@ -32,17 +32,17 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_int.h" -#include "gki.h" -#include "l2cdefs.h" -#include "port_api.h" -#include "rfc_int.h" -#include "rfcdefs.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/ptim.c b/src/RVL_SDK/bte/ptim.c index 0a3b58370..fe7bea0db 100644 --- a/src/RVL_SDK/bte/ptim.c +++ b/src/RVL_SDK/bte/ptim.c @@ -1,4 +1,4 @@ -#include "ptim.h" +#include /* Original source: * bluedroid @@ -31,12 +31,12 @@ #include -#include "gki_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "bta_sys.h" -#include "gki.h" +#include +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/ptim.h b/src/RVL_SDK/bte/ptim.h index 172980b66..fbe244217 100644 --- a/src/RVL_SDK/bte/ptim.h +++ b/src/RVL_SDK/bte/ptim.h @@ -30,9 +30,9 @@ * headers */ -#include "data_types.h" +#include -#include "gki.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/rfc_int.h b/src/RVL_SDK/bte/rfc_int.h index b1a8c165f..1a8dcc65b 100644 --- a/src/RVL_SDK/bte/rfc_int.h +++ b/src/RVL_SDK/bte/rfc_int.h @@ -30,13 +30,13 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "l2c_api.h" -#include "port_api.h" -#include "port_int.h" +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/rfc_l2cap_if.c b/src/RVL_SDK/bte/rfc_l2cap_if.c index d41a18562..5494869db 100644 --- a/src/RVL_SDK/bte/rfc_l2cap_if.c +++ b/src/RVL_SDK/bte/rfc_l2cap_if.c @@ -1,4 +1,4 @@ -#include "rfc_int.h" +#include /* Original source: * bluedroid @@ -31,16 +31,16 @@ #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "gki.h" -#include "l2cdefs.h" -#include "rfcdefs.h" -#include "l2c_api.h" -#include "port_int.h" +#include +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/rfc_mx_fsm.c b/src/RVL_SDK/bte/rfc_mx_fsm.c index 0bdc8f2a7..3c44f718e 100644 --- a/src/RVL_SDK/bte/rfc_mx_fsm.c +++ b/src/RVL_SDK/bte/rfc_mx_fsm.c @@ -1,6 +1,6 @@ -#include "bt_target.h" -#include "gki.h" -#include "rfc_int.h" +#include +#include +#include /* Original source: * bluedroid @@ -34,14 +34,14 @@ #include "revolution/types.h" #include -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "l2c_api.h" -#include "l2cdefs.h" -#include "port_int.h" -#include "rfcdefs.h" +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/rfc_port_fsm.c b/src/RVL_SDK/bte/rfc_port_fsm.c index b66039b6a..3dcbd736e 100644 --- a/src/RVL_SDK/bte/rfc_port_fsm.c +++ b/src/RVL_SDK/bte/rfc_port_fsm.c @@ -1,4 +1,4 @@ -#include "rfc_int.h" +#include /* Original source: * bluedroid @@ -29,18 +29,18 @@ * headers */ -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include #include "revolution/types.h" #include -#include "btm_api.h" -#include "btm_int.h" -#include "gki.h" -#include "port_api.h" -#include "port_int.h" -#include "rfcdefs.h" +#include +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/rfc_port_if.c b/src/RVL_SDK/bte/rfc_port_if.c index 2a1be1909..ea3a17483 100644 --- a/src/RVL_SDK/bte/rfc_port_if.c +++ b/src/RVL_SDK/bte/rfc_port_if.c @@ -1,7 +1,7 @@ -#include "bt_target.h" -#include "bt_types.h" -#include "port_api.h" -#include "rfc_int.h" +#include +#include +#include +#include /* Original source: * bluedroid @@ -32,12 +32,12 @@ * headers */ -#include "rfcdefs.h" +#include #include -#include "data_types.h" +#include -#include "port_int.h" +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/rfc_ts_frames.c b/src/RVL_SDK/bte/rfc_ts_frames.c index 1e9b3812b..c545f77cf 100644 --- a/src/RVL_SDK/bte/rfc_ts_frames.c +++ b/src/RVL_SDK/bte/rfc_ts_frames.c @@ -1,4 +1,4 @@ -#include "rfc_int.h" +#include /* Original source: * bluedroid @@ -31,16 +31,16 @@ #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "gki.h" -#include "l2c_api.h" -#include "port_api.h" -#include "port_int.h" -#include "rfcdefs.h" +#include +#include +#include +#include +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/rfc_utils.c b/src/RVL_SDK/bte/rfc_utils.c index 9b62d1b6c..fd8c19971 100644 --- a/src/RVL_SDK/bte/rfc_utils.c +++ b/src/RVL_SDK/bte/rfc_utils.c @@ -1,14 +1,14 @@ -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "btu.h" -#include "data_types.h" -#include "gki.h" -#include "l2c_api.h" -#include "port_api.h" -#include "port_int.h" -#include "rfc_int.h" -#include "rfcdefs.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "revolution/types.h" #include diff --git a/src/RVL_SDK/bte/sdp_api.c b/src/RVL_SDK/bte/sdp_api.c index 4b01fa2ed..e21c2923d 100644 --- a/src/RVL_SDK/bte/sdp_api.c +++ b/src/RVL_SDK/bte/sdp_api.c @@ -1,4 +1,4 @@ -#include "sdp_api.h" +#include /* Original source: * bluedroid @@ -32,13 +32,13 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "sdp_int.h" -#include "sdpdefs.h" +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/sdp_api.h b/src/RVL_SDK/bte/sdp_api.h index 82d7e8e1f..fc446a9dc 100644 --- a/src/RVL_SDK/bte/sdp_api.h +++ b/src/RVL_SDK/bte/sdp_api.h @@ -30,9 +30,9 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/sdp_db.c b/src/RVL_SDK/bte/sdp_db.c index b81122fc8..1d2197bbe 100644 --- a/src/RVL_SDK/bte/sdp_db.c +++ b/src/RVL_SDK/bte/sdp_db.c @@ -1,4 +1,4 @@ -#include "sdp_api.h" +#include /* Original source: * bluedroid @@ -32,14 +32,14 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "sdp_int.h" -#include "sdpdefs.h" -#include "wbt_api.h" +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/sdp_discovery.c b/src/RVL_SDK/bte/sdp_discovery.c index 7bbf14d0d..38ce0f92a 100644 --- a/src/RVL_SDK/bte/sdp_discovery.c +++ b/src/RVL_SDK/bte/sdp_discovery.c @@ -1,4 +1,4 @@ -#include "sdp_int.h" +#include /* Original source: * bluedroid @@ -32,16 +32,16 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btu.h" -#include "gki.h" -#include "l2c_api.h" -#include "sdp_api.h" -#include "sdpdefs.h" +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/sdp_int.h b/src/RVL_SDK/bte/sdp_int.h index 0154634da..79f08b1d0 100644 --- a/src/RVL_SDK/bte/sdp_int.h +++ b/src/RVL_SDK/bte/sdp_int.h @@ -30,13 +30,13 @@ * headers */ -#include "bt_target.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include -#include "gki.h" -#include "l2c_api.h" -#include "sdp_api.h" +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/sdp_main.c b/src/RVL_SDK/bte/sdp_main.c index 497d63eb5..740c7e342 100644 --- a/src/RVL_SDK/bte/sdp_main.c +++ b/src/RVL_SDK/bte/sdp_main.c @@ -1,4 +1,4 @@ -#include "sdp_int.h" +#include /* Original source: * bluedroid @@ -32,18 +32,18 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btm_api.h" -#include "btu.h" -#include "gki.h" -#include "hcidefs.h" -#include "l2c_api.h" -#include "l2cdefs.h" -#include "sdp_api.h" +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * local function declarations diff --git a/src/RVL_SDK/bte/sdp_server.c b/src/RVL_SDK/bte/sdp_server.c index ed453c9db..9dede8825 100644 --- a/src/RVL_SDK/bte/sdp_server.c +++ b/src/RVL_SDK/bte/sdp_server.c @@ -1,4 +1,4 @@ -#include "sdp_int.h" +#include /* Original source: * bluedroid @@ -32,16 +32,16 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btu.h" -#include "gki.h" -#include "l2c_api.h" -#include "sdp_api.h" -#include "sdpdefs.h" +#include +#include +#include +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/sdp_utils.c b/src/RVL_SDK/bte/sdp_utils.c index 793a73e3b..357bb6b86 100644 --- a/src/RVL_SDK/bte/sdp_utils.c +++ b/src/RVL_SDK/bte/sdp_utils.c @@ -1,4 +1,4 @@ -#include "sdp_int.h" +#include /* Original source: * bluedroid @@ -32,16 +32,16 @@ #include "revolution/types.h" #include -#include "bt_target.h" -#include "bt_trace.h" -#include "bt_types.h" -#include "data_types.h" +#include +#include +#include +#include -#include "btu.h" -#include "gki.h" -#include "l2c_api.h" -#include "sdp_api.h" -#include "sdpdefs.h" +#include +#include +#include +#include +#include /******************************************************************************* * variables diff --git a/src/RVL_SDK/bte/utl.c b/src/RVL_SDK/bte/utl.c index 683d2de1b..db0d2a1d4 100644 --- a/src/RVL_SDK/bte/utl.c +++ b/src/RVL_SDK/bte/utl.c @@ -1,4 +1,4 @@ -#include "utl.h" +#include /* Original source: * bluedroid @@ -31,11 +31,11 @@ #include // NULL -#include "bt_types.h" -#include "data_types.h" +#include +#include -#include "btm_api.h" -#include "gki.h" +#include +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/utl.h b/src/RVL_SDK/bte/utl.h index 392352b40..3e65eb5ac 100644 --- a/src/RVL_SDK/bte/utl.h +++ b/src/RVL_SDK/bte/utl.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/uusb.h b/src/RVL_SDK/bte/uusb.h index 7a4b528a3..0a78308c8 100644 --- a/src/RVL_SDK/bte/uusb.h +++ b/src/RVL_SDK/bte/uusb.h @@ -5,9 +5,9 @@ * headers */ -#include +#include "decomp.h" -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/uusb_ppc.c b/src/RVL_SDK/bte/uusb_ppc.c index dd84c1def..b1dc0449d 100644 --- a/src/RVL_SDK/bte/uusb_ppc.c +++ b/src/RVL_SDK/bte/uusb_ppc.c @@ -1,4 +1,4 @@ -#include "uusb.h" +#include /******************************************************************************* * headers @@ -7,21 +7,21 @@ #include #include -#include -#include +#include "decomp.h" +#include "macros.h" -#include "data_types.h" -#include "gki_target.h" +#include +#include -#include "bte.h" -#include "gki.h" -#include "hci.h" -#include "l2c_int.h" +#include +#include +#include +#include -#include +#include "revolution/types.h" #define IS_BTE -#include +#include "context_rvl.h" /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/wbt_api.h b/src/RVL_SDK/bte/wbt_api.h index daf30272b..b2ba93e80 100644 --- a/src/RVL_SDK/bte/wbt_api.h +++ b/src/RVL_SDK/bte/wbt_api.h @@ -30,7 +30,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/bte/wbt_ext.c b/src/RVL_SDK/bte/wbt_ext.c index 44d639750..9055adc20 100644 --- a/src/RVL_SDK/bte/wbt_ext.c +++ b/src/RVL_SDK/bte/wbt_ext.c @@ -1,4 +1,4 @@ -#include "wbt_api.h" +#include /******************************************************************************* * headers @@ -6,13 +6,13 @@ #include -#include // ARRAY_LENGTH +#include "macros.h" // ARRAY_LENGTH -#include "data_types.h" +#include -#include "hcidefs.h" // LMP_COMPID_BROADCOM -#include "sdp_api.h" -#include "sdpdefs.h" +#include // LMP_COMPID_BROADCOM +#include +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/xml_api.h b/src/RVL_SDK/bte/xml_api.h index 8c851bbbd..b619e2180 100644 --- a/src/RVL_SDK/bte/xml_api.h +++ b/src/RVL_SDK/bte/xml_api.h @@ -5,7 +5,7 @@ * headers */ -#include "data_types.h" +#include /******************************************************************************* * types diff --git a/src/RVL_SDK/bte/xml_bld.c b/src/RVL_SDK/bte/xml_bld.c index 7e71d7fbd..da1b5d9dd 100644 --- a/src/RVL_SDK/bte/xml_bld.c +++ b/src/RVL_SDK/bte/xml_bld.c @@ -1,4 +1,4 @@ -#include "xml_api.h" +#include /******************************************************************************* * headers @@ -6,7 +6,7 @@ #include // sprintf -#include "data_types.h" +#include /******************************************************************************* * functions diff --git a/src/RVL_SDK/bte/xml_parse.c b/src/RVL_SDK/bte/xml_parse.c index 6ad2ccb1f..e69d2bff1 100644 --- a/src/RVL_SDK/bte/xml_parse.c +++ b/src/RVL_SDK/bte/xml_parse.c @@ -1,4 +1,4 @@ -#include "xml_api.h" +#include /******************************************************************************* * headers @@ -7,8 +7,8 @@ #include // strtoul #include -#include "bt_trace.h" -#include "data_types.h" +#include +#include /******************************************************************************* * macros diff --git a/src/RVL_SDK/db/db.c b/src/RVL_SDK/db/db.c index 170fe5c0a..8f7e4e473 100644 --- a/src/RVL_SDK/db/db.c +++ b/src/RVL_SDK/db/db.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/db.h" +#include "revolution/os.h" DBInterface* __DBInterface = NULL; BOOL DBVerbose; diff --git a/src/RVL_SDK/dsp/dsp.c b/src/RVL_SDK/dsp/dsp.c index 03ced83be..93034742e 100644 --- a/src/RVL_SDK/dsp/dsp.c +++ b/src/RVL_SDK/dsp/dsp.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "revolution/dsp.h" +#include "revolution/dsp/dsp_debug.h" +#include "revolution/dsp/dsp_task.h" +#include "private/flipper.h" static BOOL __DSP_init_flag = 0; extern DSPTaskInfo *__DSP_curr_task; diff --git a/src/RVL_SDK/dsp/dsp_debug.c b/src/RVL_SDK/dsp/dsp_debug.c index 592aee204..570f9513b 100644 --- a/src/RVL_SDK/dsp/dsp_debug.c +++ b/src/RVL_SDK/dsp/dsp_debug.c @@ -1,4 +1,4 @@ -#include +#include "revolution/dsp/dsp_debug.h" #include void __DSP_debug_printf(char *pFormat, ...) { diff --git a/src/RVL_SDK/dsp/dsp_task.c b/src/RVL_SDK/dsp/dsp_task.c index eb1c63ee3..3ab739c65 100644 --- a/src/RVL_SDK/dsp/dsp_task.c +++ b/src/RVL_SDK/dsp/dsp_task.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/dsp/dsp_task.h" +#include "revolution/dsp/dsp_debug.h" #define WAIT_FOR_MAIL \ while (DSPCheckMailToDSP()) { } diff --git a/src/RVL_SDK/dvd/dvd.c b/src/RVL_SDK/dvd/dvd.c index 22d932986..bac641701 100644 --- a/src/RVL_SDK/dvd/dvd.c +++ b/src/RVL_SDK/dvd/dvd.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include "revolution/dvd.h" +#include "revolution/os.h" +#include "revolution/os/OSBootInfo.h" extern DVDErrorInfo __ErrorInfo; diff --git a/src/RVL_SDK/dvd/dvdDeviceError.c b/src/RVL_SDK/dvd/dvdDeviceError.c index d7c094cc4..c4b4af06b 100644 --- a/src/RVL_SDK/dvd/dvdDeviceError.c +++ b/src/RVL_SDK/dvd/dvdDeviceError.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/os.h" +#include "revolution/dvd.h" +#include "revolution/sc.h" vu8 __OSDeviceCheckCode : (OS_BASE_CACHED + 0x319C); extern u16 OSSetFontEncode(u16); diff --git a/src/RVL_SDK/dvd/dvdFatal.c b/src/RVL_SDK/dvd/dvdFatal.c index 99ed45bf1..9f05879ae 100644 --- a/src/RVL_SDK/dvd/dvdFatal.c +++ b/src/RVL_SDK/dvd/dvdFatal.c @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include "revolution/os.h" +#include "revolution/gx.h" +#include "revolution/vi.h" +#include "revolution/dvd.h" +#include "revolution/sc.h" extern u16 OSSetFontEncode(u16); diff --git a/src/RVL_SDK/dvd/dvd_broadway.c b/src/RVL_SDK/dvd/dvd_broadway.c index ee80ac94e..b8cc1940b 100644 --- a/src/RVL_SDK/dvd/dvd_broadway.c +++ b/src/RVL_SDK/dvd/dvd_broadway.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include "revolution/esp.h" +#include "revolution/ipc.h" +#include "revolution/os.h" #include static volatile bool requestInProgress = false; diff --git a/src/RVL_SDK/dvd/dvderror.c b/src/RVL_SDK/dvd/dvderror.c index 78d2c72e2..50c4e472c 100644 --- a/src/RVL_SDK/dvd/dvderror.c +++ b/src/RVL_SDK/dvd/dvderror.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/dvd.h" +#include "revolution/nand.h" static BOOL ExistFlag = FALSE; static NANDCommandBlock NandCb; diff --git a/src/RVL_SDK/dvd/dvdfs.c b/src/RVL_SDK/dvd/dvdfs.c index ff952d5ba..3a58ae0ca 100644 --- a/src/RVL_SDK/dvd/dvdfs.c +++ b/src/RVL_SDK/dvd/dvdfs.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/dvd.h" +#include "revolution/os.h" +#include "revolution/os/OSBootInfo.h" #include #include diff --git a/src/RVL_SDK/dvd/dvdidutils.c b/src/RVL_SDK/dvd/dvdidutils.c index c1d1f3a5c..0580d4c1f 100644 --- a/src/RVL_SDK/dvd/dvdidutils.c +++ b/src/RVL_SDK/dvd/dvdidutils.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/dvd.h" +#include "revolution/os.h" #include BOOL DVDCompareDiskID(const DVDDiskID* id1, const DVDDiskID* id2) { diff --git a/src/RVL_SDK/dvd/dvdqueue.c b/src/RVL_SDK/dvd/dvdqueue.c index 096309e6a..d2dd8fb9e 100644 --- a/src/RVL_SDK/dvd/dvdqueue.c +++ b/src/RVL_SDK/dvd/dvdqueue.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/os.h" +#include "revolution/dvd.h" typedef struct { DVDCommandBlock* next; diff --git a/src/RVL_SDK/esp/esp.c b/src/RVL_SDK/esp/esp.c index fdab21fff..b10546d4c 100644 --- a/src/RVL_SDK/esp/esp.c +++ b/src/RVL_SDK/esp/esp.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/esp.h" +#include "revolution/ipc/ipcclt.h" +#include "private/iosrestypes.h" static s32 __esFd = -1; diff --git a/src/RVL_SDK/exi/EXICommon.c b/src/RVL_SDK/exi/EXICommon.c index af498b9de..eaa294c2a 100644 --- a/src/RVL_SDK/exi/EXICommon.c +++ b/src/RVL_SDK/exi/EXICommon.c @@ -1,4 +1,4 @@ -#include +#include "revolution/exi.h" const u32 __EXIFreq = 4; diff --git a/src/RVL_SDK/exi/EXIUart.c b/src/RVL_SDK/exi/EXIUart.c index 10d73a960..e76c121d1 100644 --- a/src/RVL_SDK/exi/EXIUart.c +++ b/src/RVL_SDK/exi/EXIUart.c @@ -1,4 +1,4 @@ -#include +#include "revolution/exi.h" static s32 Chan; static u32 Dev; diff --git a/src/RVL_SDK/fs/fs.c b/src/RVL_SDK/fs/fs.c index 3d383da30..00b776de6 100644 --- a/src/RVL_SDK/fs/fs.c +++ b/src/RVL_SDK/fs/fs.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "revolution/fs.h" +#include "revolution/ipc.h" +#include "private/iosresclt.h" +#include "private/iosrestypes.h" #include static IOSFd __fsFd = -1; diff --git a/src/RVL_SDK/gd/GDBase.c b/src/RVL_SDK/gd/GDBase.c index 789e22d5e..c247efe72 100644 --- a/src/RVL_SDK/gd/GDBase.c +++ b/src/RVL_SDK/gd/GDBase.c @@ -1,4 +1,4 @@ -#include +#include "revolution/gd/GDBase.h" GDLObj* __GDCurrentDL = NULL; static GDOverflowCallback overflowcb = NULL; diff --git a/src/RVL_SDK/gx/GXAttr.c b/src/RVL_SDK/gx/GXAttr.c index 0a9b1662f..35d7fcd56 100644 --- a/src/RVL_SDK/gx/GXAttr.c +++ b/src/RVL_SDK/gx/GXAttr.c @@ -1,9 +1,9 @@ #include "revolution/gx/GXEnum.h" #include "revolution/gx/GXGeometry.h" -#include -#include -#include -#include +#include "private/xf_mem.h" +#include "revolution/gx.h" +#include "revolution/gx/GXRegs.h" +#include "revolution/gx/shortcut_xf_mem.h" static inline void __GXXfVtxSpecs(void) { diff --git a/src/RVL_SDK/gx/GXBump.c b/src/RVL_SDK/gx/GXBump.c index 7c655bad3..ee1d0c701 100644 --- a/src/RVL_SDK/gx/GXBump.c +++ b/src/RVL_SDK/gx/GXBump.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/gx.h" +#include "revolution/gx/GXRegs.h" +#include "revolution/os.h" void GXSetTevIndirect(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXIndTexFormat format, GXIndTexBiasSel bias_sel, GXIndTexMtxID matrix_sel, GXIndTexWrap wrap_s, GXIndTexWrap wrap_t, GXBool add_prev, GXBool utc_lod, GXIndTexAlphaSel alpha_sel) { diff --git a/src/RVL_SDK/gx/GXDisplayList.c b/src/RVL_SDK/gx/GXDisplayList.c index 134deb587..d78649b2e 100644 --- a/src/RVL_SDK/gx/GXDisplayList.c +++ b/src/RVL_SDK/gx/GXDisplayList.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "revolution/gx.h" +#include "revolution/gx/GXFifo.h" +#include "revolution/gx/GXRegs.h" +#include "revolution/os.h" #include #include diff --git a/src/RVL_SDK/gx/GXFifo.c b/src/RVL_SDK/gx/GXFifo.c index 5043d42d0..22d1f58c3 100644 --- a/src/RVL_SDK/gx/GXFifo.c +++ b/src/RVL_SDK/gx/GXFifo.c @@ -3,9 +3,9 @@ #include "revolution/gx/GXEnum.h" #include "revolution/os/OSInterrupt.h" #include "revolution/os/OSThread.h" -#include -#include -#include +#include "revolution/gx.h" +#include "revolution/os.h" +#include "revolution/gx/GXRegs.h" #include #define TOPHYSICAL(a) (((u32)a) & 0x3FFFFFFF) diff --git a/src/RVL_SDK/gx/GXGeometry.c b/src/RVL_SDK/gx/GXGeometry.c index d880518ff..09a3950cb 100644 --- a/src/RVL_SDK/gx/GXGeometry.c +++ b/src/RVL_SDK/gx/GXGeometry.c @@ -1,6 +1,6 @@ #include "revolution/gx/GXEnum.h" -#include -#include +#include "revolution/gx.h" +#include "revolution/gx/GXRegs.h" inline void __GXSetAmbMat(u32 amState) { if (amState & 0x100) { diff --git a/src/RVL_SDK/gx/GXInit.c b/src/RVL_SDK/gx/GXInit.c index de72e82e2..f7bde46a1 100644 --- a/src/RVL_SDK/gx/GXInit.c +++ b/src/RVL_SDK/gx/GXInit.c @@ -9,11 +9,11 @@ #include "revolution/gx/shortcut_xf_mem.h" #include "revolution/vi.h" #include "revolution/vi/vitypes.h" -#include -#include -#include -#include -#include +#include "revolution/gx.h" +#include "revolution/gx/GXFifo.h" +#include "revolution/gx/GXRegs.h" +#include "revolution/mtx.h" +#include "revolution/os.h" static GXFifoObj FifoObj; static GXData gxData; diff --git a/src/RVL_SDK/gx/GXLight.c b/src/RVL_SDK/gx/GXLight.c index dd11764ad..ce616aa3b 100644 --- a/src/RVL_SDK/gx/GXLight.c +++ b/src/RVL_SDK/gx/GXLight.c @@ -1,8 +1,8 @@ #include -#include -#include -#include -#include +#include "private/xf_mem.h" +#include "revolution/gx.h" +#include "revolution/gx/GXRegs.h" +#include "revolution/gx/shortcut_xf_mem.h" #define PI 3.14159265358979323846f #define BIG_NUMBER 1.0E+18f diff --git a/src/RVL_SDK/gx/GXMisc.c b/src/RVL_SDK/gx/GXMisc.c index 0695cdaf9..7c0123f78 100644 --- a/src/RVL_SDK/gx/GXMisc.c +++ b/src/RVL_SDK/gx/GXMisc.c @@ -1,12 +1,12 @@ #include "revolution/gx/GXEnum.h" #include "revolution/os/OSInterrupt.h" #include "revolution/os/OSThread.h" -#include -#include -#include -#include -#include -#include +#include "revolution/gx.h" +#include "revolution/gx/GXTypes.h" +#include "revolution/gx/GXRegs.h" +#include "revolution/gx/shortcut_pe_misc.h" +#include "private/flipper.h" +#include "revolution/os.h" static GXDrawSyncCallback TokenCB; static GXDrawDoneCallback DrawDoneCB; diff --git a/src/RVL_SDK/gx/GXPixel.c b/src/RVL_SDK/gx/GXPixel.c index 2faec06eb..a5b962405 100644 --- a/src/RVL_SDK/gx/GXPixel.c +++ b/src/RVL_SDK/gx/GXPixel.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/gx.h" +#include "revolution/gx/GXRegs.h" +#include "revolution/gx/GXTypes.h" void GXSetFog(GXFogType type, f32 startz, f32 endz, f32 nearz, f32 farz, GXColor color) { u32 fogclr = 0, fog0 = 0, fog1 = 0, fog2 = 0, fog3 = 0; diff --git a/src/RVL_SDK/gx/GXTev.c b/src/RVL_SDK/gx/GXTev.c index d0469de0e..458cad934 100644 --- a/src/RVL_SDK/gx/GXTev.c +++ b/src/RVL_SDK/gx/GXTev.c @@ -1,7 +1,7 @@ #include "revolution/gx/GXTev.h" #include "revolution/gx/GXEnum.h" #include "revolution/gx/GXRegs.h" -#include +#include "revolution/gx.h" static tev_color_env_t TEVCOpTableST0[] = { { diff --git a/src/RVL_SDK/gx/GXTexture.c b/src/RVL_SDK/gx/GXTexture.c index 4ffb985e2..ee80e1f65 100644 --- a/src/RVL_SDK/gx/GXTexture.c +++ b/src/RVL_SDK/gx/GXTexture.c @@ -3,8 +3,8 @@ #include "revolution/gx/GXTypes.h" #include "revolution/gx/shortcut_tx_reg.h" #include -#include -#include +#include "revolution/gx.h" +#include "revolution/gx/GXRegs.h" #define __GX_FLUSH_TEX_STATE() __GXFlushTextureState() diff --git a/src/RVL_SDK/gx/GXTransform.c b/src/RVL_SDK/gx/GXTransform.c index 3961e2510..07bcaae78 100644 --- a/src/RVL_SDK/gx/GXTransform.c +++ b/src/RVL_SDK/gx/GXTransform.c @@ -1,8 +1,8 @@ #include "revolution/gx/GXEnum.h" -#include -#include -#include -#include +#include "revolution/gx.h" +#include "revolution/gx/GXRegs.h" +#include "revolution/gx/GXTypes.h" +#include "revolution/mtx.h" #pragma optimizewithasm off diff --git a/src/RVL_SDK/ipc/ipcProfile.c b/src/RVL_SDK/ipc/ipcProfile.c index 04e23d222..d91e4c86a 100644 --- a/src/RVL_SDK/ipc/ipcProfile.c +++ b/src/RVL_SDK/ipc/ipcProfile.c @@ -1,4 +1,4 @@ -#include +#include "revolution.h" static s32 IpcFdArray[32]; static u32 IpcReqPtrArray[32]; diff --git a/src/RVL_SDK/ipc/memory.c b/src/RVL_SDK/ipc/memory.c index a9cd5cfcd..2fb3776dc 100644 --- a/src/RVL_SDK/ipc/memory.c +++ b/src/RVL_SDK/ipc/memory.c @@ -1,4 +1,4 @@ -#include +#include "revolution.h" #include "private/iostypes.h" typedef struct IOSChunk { diff --git a/src/RVL_SDK/mem/mem_allocator.c b/src/RVL_SDK/mem/mem_allocator.c index 6306f345e..89320b83d 100644 --- a/src/RVL_SDK/mem/mem_allocator.c +++ b/src/RVL_SDK/mem/mem_allocator.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/mem/allocator.h" +#include "revolution/mem/expHeap.h" static void* AllocatorAllocForExpHeap_(MEMAllocator *pAllocator, u32 size) { return MEMAllocFromExpHeapEx(pAllocator->pHeap, size, pAllocator->heapParam1); diff --git a/src/RVL_SDK/mem/mem_heapCommon.c b/src/RVL_SDK/mem/mem_heapCommon.c index 5db8e9314..4f969fb37 100644 --- a/src/RVL_SDK/mem/mem_heapCommon.c +++ b/src/RVL_SDK/mem/mem_heapCommon.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/mem/expHeap.h" +#include "revolution/mem/heapCommon.h" +#include "revolution/mem/list.h" static MEMList sRootList; static BOOL sRootListInitialized = FALSE; diff --git a/src/RVL_SDK/mem/mem_list.c b/src/RVL_SDK/mem/mem_list.c index 2bc35f1fc..6e529302f 100644 --- a/src/RVL_SDK/mem/mem_list.c +++ b/src/RVL_SDK/mem/mem_list.c @@ -1,4 +1,4 @@ -#include +#include "revolution/mem/list.h" // I've tried inlines but only a macro seems to work diff --git a/src/RVL_SDK/nand/NANDCheck.c b/src/RVL_SDK/nand/NANDCheck.c index 32e959f6e..15e0c8610 100644 --- a/src/RVL_SDK/nand/NANDCheck.c +++ b/src/RVL_SDK/nand/NANDCheck.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nand.h" +#include "revolution/fs.h" static const char *USER_DIR_LIST[] = { diff --git a/src/RVL_SDK/nand/NANDCore.c b/src/RVL_SDK/nand/NANDCore.c index 0d509a245..758fca014 100644 --- a/src/RVL_SDK/nand/NANDCore.c +++ b/src/RVL_SDK/nand/NANDCore.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "revolution/nand.h" +#include "revolution/esp.h" +#include "revolution/fs.h" +#include "revolution/os.h" #include #include #include diff --git a/src/RVL_SDK/nand/NANDLogging.c b/src/RVL_SDK/nand/NANDLogging.c index d54cc80ea..7696640c4 100644 --- a/src/RVL_SDK/nand/NANDLogging.c +++ b/src/RVL_SDK/nand/NANDLogging.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/fs.h" +#include "revolution/nand.h" #include #include #include diff --git a/src/RVL_SDK/nand/NANDOpenClose.c b/src/RVL_SDK/nand/NANDOpenClose.c index 498f54c27..99cc3d7b3 100644 --- a/src/RVL_SDK/nand/NANDOpenClose.c +++ b/src/RVL_SDK/nand/NANDOpenClose.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nand.h" +#include "revolution/fs.h" #include static void nandOpenCallback(ISFSError, void *); diff --git a/src/RVL_SDK/nand/NANDSecret.c b/src/RVL_SDK/nand/NANDSecret.c index b227f57f0..bd2563147 100644 --- a/src/RVL_SDK/nand/NANDSecret.c +++ b/src/RVL_SDK/nand/NANDSecret.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nand.h" +#include "revolution/fs.h" s32 NANDSecretGetUsage(const char* path, u32* fsBlock, u32* inode) { if (!nandIsInitialized()) { diff --git a/src/RVL_SDK/nand/nand.c b/src/RVL_SDK/nand/nand.c index d9fbc83d0..7359c3e02 100644 --- a/src/RVL_SDK/nand/nand.c +++ b/src/RVL_SDK/nand/nand.c @@ -1,6 +1,6 @@ #include -#include -#include +#include "revolution/fs.h" +#include "revolution/nand.h" static BOOL nandInspectPermission(u8); diff --git a/src/RVL_SDK/nwc24/NWC24Config.c b/src/RVL_SDK/nwc24/NWC24Config.c index aa7e1ef22..ac527efa9 100644 --- a/src/RVL_SDK/nwc24/NWC24Config.c +++ b/src/RVL_SDK/nwc24/NWC24Config.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "revolution/DVD.h" +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" +#include "revolution/os.h" #define CONFIG_MAGIC FOURCC('W', 'c', 'C', 'f') #define CONFIG_VERSION 8 diff --git a/src/RVL_SDK/nwc24/NWC24Download.c b/src/RVL_SDK/nwc24/NWC24Download.c index bd94382b0..68cb1de05 100644 --- a/src/RVL_SDK/nwc24/NWC24Download.c +++ b/src/RVL_SDK/nwc24/NWC24Download.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" #include diff --git a/src/RVL_SDK/nwc24/NWC24FileAPI.c b/src/RVL_SDK/nwc24/NWC24FileAPI.c index e07ffa36d..8fce424aa 100644 --- a/src/RVL_SDK/nwc24/NWC24FileAPI.c +++ b/src/RVL_SDK/nwc24/NWC24FileAPI.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/nand.h" +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" #include diff --git a/src/RVL_SDK/nwc24/NWC24FriendList.c b/src/RVL_SDK/nwc24/NWC24FriendList.c index 36be83570..b70103b58 100644 --- a/src/RVL_SDK/nwc24/NWC24FriendList.c +++ b/src/RVL_SDK/nwc24/NWC24FriendList.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" #define FRIEND_LIST_MAGIC FOURCC('W', 'c', 'F', 'l') #define FRIEND_LIST_VERSION 2 diff --git a/src/RVL_SDK/nwc24/NWC24Ipc.c b/src/RVL_SDK/nwc24/NWC24Ipc.c index 8e107d58f..f6fbaad5c 100644 --- a/src/RVL_SDK/nwc24/NWC24Ipc.c +++ b/src/RVL_SDK/nwc24/NWC24Ipc.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" static BOOL NWC24iIsRequestPending = FALSE; diff --git a/src/RVL_SDK/nwc24/NWC24MBoxCtrl.c b/src/RVL_SDK/nwc24/NWC24MBoxCtrl.c index 30aa98979..738c1d273 100644 --- a/src/RVL_SDK/nwc24/NWC24MBoxCtrl.c +++ b/src/RVL_SDK/nwc24/NWC24MBoxCtrl.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" #include diff --git a/src/RVL_SDK/nwc24/NWC24Manage.c b/src/RVL_SDK/nwc24/NWC24Manage.c index d9be81e65..193138865 100644 --- a/src/RVL_SDK/nwc24/NWC24Manage.c +++ b/src/RVL_SDK/nwc24/NWC24Manage.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" +#include "revolution/os.h" +#include "revolution/vf.h" typedef enum { NWC24_LIB_CLOSED, NWC24_LIB_OPENED, NWC24_LIB_OPENED_BY_TOOL, NWC24_LIB_BLOCKED } NWC24LibState; diff --git a/src/RVL_SDK/nwc24/NWC24Mime.c b/src/RVL_SDK/nwc24/NWC24Mime.c index 1cdc46b2e..7b0d99d1a 100644 --- a/src/RVL_SDK/nwc24/NWC24Mime.c +++ b/src/RVL_SDK/nwc24/NWC24Mime.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" static const char* MIMEEncStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; diff --git a/src/RVL_SDK/nwc24/NWC24MsgCommit.c b/src/RVL_SDK/nwc24/NWC24MsgCommit.c index 138d66028..8213f2f39 100644 --- a/src/RVL_SDK/nwc24/NWC24MsgCommit.c +++ b/src/RVL_SDK/nwc24/NWC24MsgCommit.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "revolution/net.h" +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" +#include "revolution/os.h" #define B64_STEP (60 - (NWC24i_KSTRLEN(" ") - 1 + NWC24i_KSTRLEN("\r\n") - 1)) diff --git a/src/RVL_SDK/nwc24/NWC24MsgObj.c b/src/RVL_SDK/nwc24/NWC24MsgObj.c index 929ce7931..b394cec27 100644 --- a/src/RVL_SDK/nwc24/NWC24MsgObj.c +++ b/src/RVL_SDK/nwc24/NWC24MsgObj.c @@ -1,7 +1,7 @@ #include -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" #define MSG_YEAR_MIN 2000 #define MSG_YEAR_MAX 2035 diff --git a/src/RVL_SDK/nwc24/NWC24Parser.c b/src/RVL_SDK/nwc24/NWC24Parser.c index c96ca9aeb..2f6b89418 100644 --- a/src/RVL_SDK/nwc24/NWC24Parser.c +++ b/src/RVL_SDK/nwc24/NWC24Parser.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" static const char* MIMETypeStr[] = { "application/octet-stream", diff --git a/src/RVL_SDK/nwc24/NWC24Schedule.c b/src/RVL_SDK/nwc24/NWC24Schedule.c index a37d62e2f..b14f9ab05 100644 --- a/src/RVL_SDK/nwc24/NWC24Schedule.c +++ b/src/RVL_SDK/nwc24/NWC24Schedule.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" +#include "revolution/os.h" #include diff --git a/src/RVL_SDK/nwc24/NWC24SecretFList.c b/src/RVL_SDK/nwc24/NWC24SecretFList.c index 32cb0f1bb..471659eff 100644 --- a/src/RVL_SDK/nwc24/NWC24SecretFList.c +++ b/src/RVL_SDK/nwc24/NWC24SecretFList.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" #define SECRET_FRIEND_LIST_MAGIC FOURCC('W', 'c', 'F', 's') #define SECRET_FRIEND_LIST_VERSION 2 diff --git a/src/RVL_SDK/nwc24/NWC24StdAPI.c b/src/RVL_SDK/nwc24/NWC24StdAPI.c index 0e57c6454..58288d4a6 100644 --- a/src/RVL_SDK/nwc24/NWC24StdAPI.c +++ b/src/RVL_SDK/nwc24/NWC24StdAPI.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" char* Mail_strcpy(char* pDst, const char* pSrc) { char* pOrigin = pDst; diff --git a/src/RVL_SDK/nwc24/NWC24System.c b/src/RVL_SDK/nwc24/NWC24System.c index 9ac76d49b..2a5cb8349 100644 --- a/src/RVL_SDK/nwc24/NWC24System.c +++ b/src/RVL_SDK/nwc24/NWC24System.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" +#include "revolution/os.h" +#include "revolution/sc.h" #define SHUTDOWN_RETRY_MAX 5 diff --git a/src/RVL_SDK/nwc24/NWC24Time.c b/src/RVL_SDK/nwc24/NWC24Time.c index f86698ece..64c25ace7 100644 --- a/src/RVL_SDK/nwc24/NWC24Time.c +++ b/src/RVL_SDK/nwc24/NWC24Time.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" +#include "revolution/sc.h" #include diff --git a/src/RVL_SDK/nwc24/NWC24Utils.c b/src/RVL_SDK/nwc24/NWC24Utils.c index a722acba1..781ffa4cc 100644 --- a/src/RVL_SDK/nwc24/NWC24Utils.c +++ b/src/RVL_SDK/nwc24/NWC24Utils.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/nwc24.h" +#include "revolution/nwc24/NWC24Internal.h" void NWC24Data_Init(NWC24Data* pData) { pData->pData = NULL; diff --git a/src/RVL_SDK/os/OS.c b/src/RVL_SDK/os/OS.c index 0183754d2..78775ae0b 100644 --- a/src/RVL_SDK/os/OS.c +++ b/src/RVL_SDK/os/OS.c @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include "revolution/os.h" +#include "revolution/dvd.h" +#include "revolution/db.h" +#include "revolution/ipc.h" +#include "revolution/sc.h" +#include "revolution/os/OSBootInfo.h" #include #include "private/flipper.h" diff --git a/src/RVL_SDK/os/OSAlarm.c b/src/RVL_SDK/os/OSAlarm.c index 834125759..123d561ae 100644 --- a/src/RVL_SDK/os/OSAlarm.c +++ b/src/RVL_SDK/os/OSAlarm.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/os/OSAlarm.h" +#include "revolution/dvd.h" +#include "revolution/os.h" BOOL __DVDTestAlarm(const OSAlarm *); static void DecrementerExceptionHandler(__OSException, OSContext *); diff --git a/src/RVL_SDK/os/OSAlloc.c b/src/RVL_SDK/os/OSAlloc.c index b881e0c6b..de1a34970 100644 --- a/src/RVL_SDK/os/OSAlloc.c +++ b/src/RVL_SDK/os/OSAlloc.c @@ -1,4 +1,4 @@ -#include +#include "revolution.h" #define TRUNC(n, a) (((u32)(n)) & ~((a) - 1)) #define ROUND(n, a) (((u32)(n) + (a) - 1) & ~((a) - 1)) diff --git a/src/RVL_SDK/os/OSArena.c b/src/RVL_SDK/os/OSArena.c index cc8593a4b..3b9c27cd7 100644 --- a/src/RVL_SDK/os/OSArena.c +++ b/src/RVL_SDK/os/OSArena.c @@ -1,4 +1,4 @@ -#include +#include "revolution.h" static void* __OSArenaHi = (void*)0x00000000; static void* __OSArenaLo = (void*)0xFFFFFFFF; diff --git a/src/RVL_SDK/os/OSAudioSystem.c b/src/RVL_SDK/os/OSAudioSystem.c index 9cb471c13..c1606fde3 100644 --- a/src/RVL_SDK/os/OSAudioSystem.c +++ b/src/RVL_SDK/os/OSAudioSystem.c @@ -1,5 +1,5 @@ #include "private/flipper.h" -#include +#include "revolution/os.h" #include #define PPCACR_OFFSET (OS_BASE_UNCACHED + 0x800000) diff --git a/src/RVL_SDK/os/OSCache.c b/src/RVL_SDK/os/OSCache.c index bc2d62722..7469151aa 100644 --- a/src/RVL_SDK/os/OSCache.c +++ b/src/RVL_SDK/os/OSCache.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/db.h" +#include "revolution/os/OSCache.h" +#include "revolution/os.h" //needs to be a char[] to prevent something from showing up in .sdata static char error[] = ">>> L2 INVALIDATE : SHOULD NEVER HAPPEN\n"; diff --git a/src/RVL_SDK/os/OSContext.c b/src/RVL_SDK/os/OSContext.c index 9b1520407..4038c2c94 100644 --- a/src/RVL_SDK/os/OSContext.c +++ b/src/RVL_SDK/os/OSContext.c @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include "revolution/base/PPCArch.h" +#include "revolution/os.h" +#include "revolution/os/OSContext.h" +#include "revolution/os/OSException.h" +#include "revolution/db.h" +#include "private/OSLoMem.h" #ifdef __MWERKS__ volatile OSContext* __OSCurrentContext: (OS_BASE_CACHED | OS_CURRENTCONTEXT_ADDR); diff --git a/src/RVL_SDK/os/OSError.c b/src/RVL_SDK/os/OSError.c index 92536bd0d..f37afe4a1 100644 --- a/src/RVL_SDK/os/OSError.c +++ b/src/RVL_SDK/os/OSError.c @@ -1,9 +1,9 @@ #include "revolution/os/OSThread.h" #include -#include -#include -#include -#include +#include "private/OSLoMem.h" +#include "private/flipper.h" +#include "revolution/os.h" +#include "revolution/types.h" #ifdef __MWERKS__ OSThread* __OSCurrentThread : (OS_BASE_CACHED | OS_CURRENTTHREAD_ADDR); diff --git a/src/RVL_SDK/os/OSExec.c b/src/RVL_SDK/os/OSExec.c index e84610f67..a3f130515 100644 --- a/src/RVL_SDK/os/OSExec.c +++ b/src/RVL_SDK/os/OSExec.c @@ -1,10 +1,10 @@ #include -#include -#include -#include -#include -#include -#include +#include "private/flipper.h" +#include "revolution/dvd.h" +#include "revolution/os.h" +#include "revolution/os/OSExecParams.h" +#include "revolution/os/OSTIme.h" +#include "revolution/types.h" #include static volatile BOOL Prepared; diff --git a/src/RVL_SDK/os/OSFatal.c b/src/RVL_SDK/os/OSFatal.c index 07525e76d..ee074c403 100644 --- a/src/RVL_SDK/os/OSFatal.c +++ b/src/RVL_SDK/os/OSFatal.c @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include "revolution/os.h" +#include "revolution/exi.h" +#include "revolution/os/OSBootInfo.h" +#include "revolution/vi.h" +#include "private/flipper.h" #include typedef struct OSFatalParam { diff --git a/src/RVL_SDK/os/OSFont.c b/src/RVL_SDK/os/OSFont.c index d77311e80..e4318ed6a 100644 --- a/src/RVL_SDK/os/OSFont.c +++ b/src/RVL_SDK/os/OSFont.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/os.h" +#include "private/flipper.h" static u16 FontEncode = 0xFFFF; static OSFontHeader* FontDataAnsi; diff --git a/src/RVL_SDK/os/OSInterrupt.c b/src/RVL_SDK/os/OSInterrupt.c index 53343128e..d8ce3cda5 100644 --- a/src/RVL_SDK/os/OSInterrupt.c +++ b/src/RVL_SDK/os/OSInterrupt.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include "private/flipper.h" +#include "revolution/os.h" +#include "revolution/os/OSInterrupt.h" static __OSInterruptHandler* InterruptHandlerTable; diff --git a/src/RVL_SDK/os/OSIpc.c b/src/RVL_SDK/os/OSIpc.c index 469b3cb4e..068d809ac 100644 --- a/src/RVL_SDK/os/OSIpc.c +++ b/src/RVL_SDK/os/OSIpc.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/os/OSIpc.h" +#include "revolution/os.h" static void* IpcBufferHi; static void* IpcBufferLo = (void*)0xFFFFFFFF; diff --git a/src/RVL_SDK/os/OSLink.c b/src/RVL_SDK/os/OSLink.c index cd63862e3..7ffba85c6 100644 --- a/src/RVL_SDK/os/OSLink.c +++ b/src/RVL_SDK/os/OSLink.c @@ -1,4 +1,4 @@ -#include +#include "revolution/os/OSLink.h" void __OSModuleInit(void) { /* SMG1 doesn't use REL so these are never used */ diff --git a/src/RVL_SDK/os/OSMemory.c b/src/RVL_SDK/os/OSMemory.c index d0f2f2633..e08239859 100644 --- a/src/RVL_SDK/os/OSMemory.c +++ b/src/RVL_SDK/os/OSMemory.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/os.h" +#include "revolution/os/OSReset.h" +#include "private/flipper.h" extern OSErrorHandler __OSErrorTable[]; static BOOL OnShutdown( BOOL final, u32 event ); diff --git a/src/RVL_SDK/os/OSMutex.c b/src/RVL_SDK/os/OSMutex.c index bfaedca3c..1c81ed8aa 100644 --- a/src/RVL_SDK/os/OSMutex.c +++ b/src/RVL_SDK/os/OSMutex.c @@ -1,4 +1,4 @@ -#include +#include "revolution/os.h" #define EnqueueTail(queue, mutex, link) \ do { \ diff --git a/src/RVL_SDK/os/OSPlayRecord.c b/src/RVL_SDK/os/OSPlayRecord.c index 239d448c0..f35eead4f 100644 --- a/src/RVL_SDK/os/OSPlayRecord.c +++ b/src/RVL_SDK/os/OSPlayRecord.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/os.h" +#include "revolution/nand.h" static BOOL PlayRecordGet = FALSE; static OSPlayRecord PlayRecord __attribute__ ((aligned(32))) = {0}; diff --git a/src/RVL_SDK/os/OSPlayTime.c b/src/RVL_SDK/os/OSPlayTime.c index 2289d5ef3..85651fe48 100644 --- a/src/RVL_SDK/os/OSPlayTime.c +++ b/src/RVL_SDK/os/OSPlayTime.c @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include "revolution/ai.h" +#include "revolution/os.h" +#include "revolution/esp.h" +#include "revolution/nand.h" +#include "private/OSLoMem.h" OSThread* __OSExpireThread; OSAlarm __OSExpireAlarm; diff --git a/src/RVL_SDK/os/OSReset.c b/src/RVL_SDK/os/OSReset.c index 7ddea7519..e8a4434d7 100644 --- a/src/RVL_SDK/os/OSReset.c +++ b/src/RVL_SDK/os/OSReset.c @@ -1,11 +1,11 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "private/OSLoMem.h" +#include "private/flipper.h" +#include "revolution/dvd.h" +#include "revolution/os.h" +#include "revolution/os/OSExecParams.h" +#include "revolution/pad.h" +#include "revolution/sc.h" extern BOOL __OSInNandBoot; extern BOOL __OSInReboot; diff --git a/src/RVL_SDK/os/OSRtc.c b/src/RVL_SDK/os/OSRtc.c index 4fea0413d..afe296b21 100644 --- a/src/RVL_SDK/os/OSRtc.c +++ b/src/RVL_SDK/os/OSRtc.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/os.h" +#include "revolution/exi.h" typedef struct SramControl { u8 sram[64]; diff --git a/src/RVL_SDK/os/OSStateFlags.c b/src/RVL_SDK/os/OSStateFlags.c index f77e261c8..8eccfc02e 100644 --- a/src/RVL_SDK/os/OSStateFlags.c +++ b/src/RVL_SDK/os/OSStateFlags.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/os.h" +#include "revolution/nand.h" #include #include diff --git a/src/RVL_SDK/os/OSStateTM.c b/src/RVL_SDK/os/OSStateTM.c index 12fb9edb8..c5c0bbafb 100644 --- a/src/RVL_SDK/os/OSStateTM.c +++ b/src/RVL_SDK/os/OSStateTM.c @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include "private/flipper.h" +#include "private/iosresclt.h" +#include "revolution/ipc/ipcclt.h" +#include "revolution/os.h" +#include "revolution/os/OSResetSW.h" +#include "revolution/vi.h" static u32 StmImInBuf[8] __attribute__((align(32))); static u32 StmImOutBuf[8] __attribute__((align(32))); diff --git a/src/RVL_SDK/os/OSSync.c b/src/RVL_SDK/os/OSSync.c index 6ac0a8dd1..f7b0b4200 100644 --- a/src/RVL_SDK/os/OSSync.c +++ b/src/RVL_SDK/os/OSSync.c @@ -1,4 +1,4 @@ -#include +#include "revolution/os.h" #include static void __OSSystemCallVectorStart(void); diff --git a/src/RVL_SDK/os/OSThread.c b/src/RVL_SDK/os/OSThread.c index 50376926a..c18d7186f 100644 --- a/src/RVL_SDK/os/OSThread.c +++ b/src/RVL_SDK/os/OSThread.c @@ -1,5 +1,5 @@ -#include -#include +#include "private/OSLoMem.h" +#include "revolution/os.h" extern OSErrorHandler __OSErrorTable[]; diff --git a/src/RVL_SDK/os/OSTime.c b/src/RVL_SDK/os/OSTime.c index be65bd59b..4f1ab6188 100644 --- a/src/RVL_SDK/os/OSTime.c +++ b/src/RVL_SDK/os/OSTime.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/os/OSTime.h" +#include "revolution/os.h" static int YearDays[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; static int LeapYearDays[] = { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }; diff --git a/src/RVL_SDK/os/OSUtf.c b/src/RVL_SDK/os/OSUtf.c index f30ee34c3..71ee96b40 100644 --- a/src/RVL_SDK/os/OSUtf.c +++ b/src/RVL_SDK/os/OSUtf.c @@ -1,4 +1,4 @@ -#include +#include "revolution/os.h" static u16 UcsAnsiTable[] = { 0x20AC, diff --git a/src/RVL_SDK/os/init/__start.c b/src/RVL_SDK/os/init/__start.c index 8ade79f82..4e02d51a5 100644 --- a/src/RVL_SDK/os/init/__start.c +++ b/src/RVL_SDK/os/init/__start.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution.h" +#include "revolution/os.h" #include <__ppc_eabi_init.h> #include <__ppc_eabi_linker.h> diff --git a/src/RVL_SDK/pad/Pad.c b/src/RVL_SDK/pad/Pad.c index 70b4e7336..55867cdcd 100644 --- a/src/RVL_SDK/pad/Pad.c +++ b/src/RVL_SDK/pad/Pad.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/types.h" +#include "revolution/os.h" u8 GameChoice : (OS_BASE_CACHED | 0x30E3); diff --git a/src/RVL_SDK/sc/scapi.c b/src/RVL_SDK/sc/scapi.c index 9844af72c..89e91572b 100644 --- a/src/RVL_SDK/sc/scapi.c +++ b/src/RVL_SDK/sc/scapi.c @@ -1,4 +1,4 @@ -#include +#include "revolution/sc.h" u8 SCGetAspectRatio(void) { u8 ratio; diff --git a/src/RVL_SDK/sc/scapi_prdinfo.c b/src/RVL_SDK/sc/scapi_prdinfo.c index f2d960f10..2e8911f98 100644 --- a/src/RVL_SDK/sc/scapi_prdinfo.c +++ b/src/RVL_SDK/sc/scapi_prdinfo.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/sc.h" +#include "revolution/os.h" #include typedef struct { diff --git a/src/RVL_SDK/sc/scsystem.c b/src/RVL_SDK/sc/scsystem.c index 07b8e94a1..22618aba3 100644 --- a/src/RVL_SDK/sc/scsystem.c +++ b/src/RVL_SDK/sc/scsystem.c @@ -1,6 +1,6 @@ #include #include -#include +#include "revolution/sc.h" const char* __SCVersion = "<< RVL_SDK - SC \trelease build: Feb 22 2008 06:21:38 (0x4199_60831) >>"; diff --git a/src/RVL_SDK/si/SIBios.c b/src/RVL_SDK/si/SIBios.c index fa28c74b1..21f91b3de 100644 --- a/src/RVL_SDK/si/SIBios.c +++ b/src/RVL_SDK/si/SIBios.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "revolution/si.h" +#include "revolution/os.h" +#include "private/flipper.h" +#include "private/io_reg.h" #define OFFSET(n, a) (((u32) (n)) & ((a) - 1)) #define ROUND(n, a) (((u32) (n) + (a) - 1) & ~((a) - 1)) diff --git a/src/RVL_SDK/si/SISamplingRate.c b/src/RVL_SDK/si/SISamplingRate.c index 2c1b04461..f72ea8bd6 100644 --- a/src/RVL_SDK/si/SISamplingRate.c +++ b/src/RVL_SDK/si/SISamplingRate.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "revolution/si.h" +#include "revolution/vi.h" +#include "private/flipper.h" static u32 SamplingRate; diff --git a/src/RVL_SDK/thp/THPAudio.c b/src/RVL_SDK/thp/THPAudio.c index 560cef87d..13e790136 100644 --- a/src/RVL_SDK/thp/THPAudio.c +++ b/src/RVL_SDK/thp/THPAudio.c @@ -1,4 +1,4 @@ -#include +#include "revolution/thp.h" u32 THPAudioDecode(s16 *audioBuffer, u8 *audioFrame, s32 flag) { THPAudioRecordHeader *header; diff --git a/src/RVL_SDK/thp/THPDec.c b/src/RVL_SDK/thp/THPDec.c index 26c54f2ec..bde82b0c6 100644 --- a/src/RVL_SDK/thp/THPDec.c +++ b/src/RVL_SDK/thp/THPDec.c @@ -1,4 +1,4 @@ -#include +#include "revolution/thp.h" const char* __THPVersion = "<< RVL_SDK - THP \trelease build: Aug 8 2007 01:31:54 (0x4199_60831) >>"; diff --git a/src/RVL_SDK/vf/pf_api_util.c b/src/RVL_SDK/vf/pf_api_util.c index 58844e2af..b6cf65dc1 100644 --- a/src/RVL_SDK/vf/pf_api_util.c +++ b/src/RVL_SDK/vf/pf_api_util.c @@ -7,7 +7,7 @@ int VFipf_error_to_api_error[40] = { 12, 22, 22, 8, 2, 8, 8, 27, 9, 46, }; -#include +#include "revolution/types.h" u32 VFiPFAPI_ParseOpenModeString(const char* mode_str) { u32 open_mode_util; diff --git a/src/RVL_SDK/vi/i2c.c b/src/RVL_SDK/vi/i2c.c index 9f765d406..779559517 100644 --- a/src/RVL_SDK/vi/i2c.c +++ b/src/RVL_SDK/vi/i2c.c @@ -1,4 +1,4 @@ -#include +#include "revolution/os.h" static volatile u32 __i2c_ident_flag = 1; static volatile u32 __i2c_ident_first = 0; diff --git a/src/RVL_SDK/vi/vi.c b/src/RVL_SDK/vi/vi.c index fa35e0a21..db8000360 100644 --- a/src/RVL_SDK/vi/vi.c +++ b/src/RVL_SDK/vi/vi.c @@ -1,8 +1,8 @@ #include "private/flipper.h" -#include -#include -#include -#include +#include "revolution/dvd.h" +#include "revolution/os.h" +#include "revolution/sc.h" +#include "revolution/vi.h" const char* __VIVersion = "<< RVL_SDK - VI \trelease build: Aug 8 2007 02:07:17 (0x4199_60831) >>"; diff --git a/src/RVL_SDK/vi/vi3in1.c b/src/RVL_SDK/vi/vi3in1.c index cc76de306..7be84d62d 100644 --- a/src/RVL_SDK/vi/vi3in1.c +++ b/src/RVL_SDK/vi/vi3in1.c @@ -1,5 +1,5 @@ -#include -#include +#include "revolution/vi.h" +#include "revolution/os.h" static VIVideo Vdac_Flag_Region; volatile u32 Vdac_Flag_Changed = 0; diff --git a/src/RVL_SDK/wenc/wenc.c b/src/RVL_SDK/wenc/wenc.c index 04bb6fcdf..1106c3f37 100644 --- a/src/RVL_SDK/wenc/wenc.c +++ b/src/RVL_SDK/wenc/wenc.c @@ -1,5 +1,5 @@ #include -#include +#include "revolution/wenc.h" s32 WENCGetEncodeData(WENCInfo* info, u32 flag, const s16* pcmData, s32 samples, u8* adpcmData) { const f64 table[] = {0.89843750, 0.89843750, 0.89843750, 0.89843750, 1.19921875, 1.59765625, 2.00000000, 2.39843750}; diff --git a/src/RVL_SDK/wud/WUD.c b/src/RVL_SDK/wud/WUD.c index 1ec8fb6c2..bbf35bd65 100644 --- a/src/RVL_SDK/wud/WUD.c +++ b/src/RVL_SDK/wud/WUD.c @@ -5,11 +5,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "revolution/bte.h" +#include "revolution/os.h" +#include "revolution/sc.h" +#include "revolution/wpad.h" +#include "revolution/wud.h" #define DEBUGPrint WUD_DEBUGPrint diff --git a/src/Runtime/Gecko_ExceptionPPC.cpp b/src/Runtime/Gecko_ExceptionPPC.cpp index 5e2af6041..6bba7a879 100644 --- a/src/Runtime/Gecko_ExceptionPPC.cpp +++ b/src/Runtime/Gecko_ExceptionPPC.cpp @@ -1,4 +1,4 @@ -#include +#include "NMWException.h" typedef struct ProcessInfo { __eti_init_info* exception_info; diff --git a/src/Runtime/NMWException.cpp b/src/Runtime/NMWException.cpp index 8453fd1fc..433e18202 100644 --- a/src/Runtime/NMWException.cpp +++ b/src/Runtime/NMWException.cpp @@ -1,4 +1,4 @@ -#include +#include "NMWException.h" class __partial_array_destructor { public: diff --git a/src/Runtime/__init_cpp_exceptions.cpp b/src/Runtime/__init_cpp_exceptions.cpp index 00f7de2fd..a135ed485 100644 --- a/src/Runtime/__init_cpp_exceptions.cpp +++ b/src/Runtime/__init_cpp_exceptions.cpp @@ -1,5 +1,5 @@ -#include -#include <__ppc_eabi_linker.h> +#include "NMWException.h" +#include "__ppc_eabi_linker.h" #ifdef __cplusplus extern "C" { diff --git a/src/Runtime/__mem.c b/src/Runtime/__mem.c index e75d00b0d..366f3cb5a 100644 --- a/src/Runtime/__mem.c +++ b/src/Runtime/__mem.c @@ -1,4 +1,4 @@ -#include <__mem.h> +#include "__mem.h" void* memcpy(void *pDest, const void *pSrc, size_t len) { const char *p; diff --git a/src/Runtime/runtime.c b/src/Runtime/runtime.c index 0921d2b48..b93ad7d2a 100644 --- a/src/Runtime/runtime.c +++ b/src/Runtime/runtime.c @@ -2,7 +2,7 @@ extern "C" { #endif -#include +#include "runtime.h" /* macros for GPR/FPR resting and saving */ #define SAVE_FPR(reg) _savefpr_ ## reg diff --git a/src/nw4r/lyt/lyt_animation.cpp b/src/nw4r/lyt/lyt_animation.cpp index fccb2d518..069f8ccb6 100644 --- a/src/nw4r/lyt/lyt_animation.cpp +++ b/src/nw4r/lyt/lyt_animation.cpp @@ -1,12 +1,12 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "nw4r/lyt/common.h" +#include "nw4r/lyt/pane.h" +#include "nw4r/lyt/group.h" +#include "nw4r/lyt/material.h" +#include "nw4r/lyt/animation.h" +#include "nw4r/lyt/layout.h" +#include "nw4r/lyt/resourceAccessor.h" #include const f32 R_SAME_TOLERANCE = 1.0e-5F; diff --git a/src/nw4r/lyt/lyt_common.cpp b/src/nw4r/lyt/lyt_common.cpp index 616e7de41..515da0f1e 100644 --- a/src/nw4r/lyt/lyt_common.cpp +++ b/src/nw4r/lyt/lyt_common.cpp @@ -1,8 +1,8 @@ #include "nw4r/lyt/common.h" #include "nw4r/lyt/layout.h" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXGeometry.h" -#include "revolution/gx/GXVert.h" +#include +#include +#include #include namespace nw4r { diff --git a/src/nw4r/lyt/lyt_init.cpp b/src/nw4r/lyt/lyt_init.cpp index 7c41d737b..98b2651fd 100644 --- a/src/nw4r/lyt/lyt_init.cpp +++ b/src/nw4r/lyt/lyt_init.cpp @@ -1,6 +1,6 @@ #include "nw4r/lyt/init.h" -#include "revolution/os.h" -#include "revolution/os/OSFastCast.h" +#include +#include namespace { const char* NW4R_LYT_Version_ = "<< NW4R - LYT \tfinal build: Jul 17 2007 12:25:23 (0x4199_60831) >>"; diff --git a/src/nw4r/lyt/lyt_layout.cpp b/src/nw4r/lyt/lyt_layout.cpp index 98c4aa360..1aebcf230 100644 --- a/src/nw4r/lyt/lyt_layout.cpp +++ b/src/nw4r/lyt/lyt_layout.cpp @@ -11,7 +11,7 @@ #include "nw4r/lyt/resources.h" #include "nw4r/lyt/util.h" #include "nw4r/ut/Rect.h" -#include "revolution/mem/allocator.h" +#include namespace { using namespace nw4r; diff --git a/src/nw4r/lyt/lyt_texMap.cpp b/src/nw4r/lyt/lyt_texMap.cpp index be523e3c8..f60c06f60 100644 --- a/src/nw4r/lyt/lyt_texMap.cpp +++ b/src/nw4r/lyt/lyt_texMap.cpp @@ -1,9 +1,9 @@ #include "nw4r/lyt/common.h" #include "nw4r/lyt/texMap.h" -#include "revolution/gx/GXEnum.h" -#include "revolution/gx/GXGet.h" -#include "revolution/gx/GXStruct.h" -#include "revolution/tpl.h" +#include +#include +#include +#include namespace nw4r { namespace lyt { diff --git a/src/nw4r/ut/ut_LinkList.cpp b/src/nw4r/ut/ut_LinkList.cpp index 3d45bc513..f5550fb27 100644 --- a/src/nw4r/ut/ut_LinkList.cpp +++ b/src/nw4r/ut/ut_LinkList.cpp @@ -1,5 +1,5 @@ #include "nw4r/ut/LinkList.h" -#include "revolution/types.h" +#include namespace nw4r { namespace ut {