Moved AMLOperation enum in its own header

include/AMLOperations.h

@@ -0,0 +1,145 @@
+/*
+ * This file is part of the libACPI project
+ * Copyright (c) 2018 Manuel Deneu.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+typedef enum
+{
+ AML_Unknown , // 0
+ AML_ZeroOp ,
+ AML_OneOp ,
+ AML_AliasOp ,
+ AML_NameOp ,
+ AML_BytePrefix ,
+ AML_WordPrefix ,
+ AML_DWordPrefix , // 7
+ AML_StringPrefix ,
+ AML_QWordPrefix ,
+ AML_ScopeOp , // 10
+ AML_BufferOp ,
+ AML_PackageOp ,
+ AML_VarPackageOp ,
+ AML_MethodOp ,
+ AML_DualNamePrefix ,
+ AML_MultiNamePrefix ,//16
+ AML_RootChar ,
+ AML_ParentPrefixChar ,
+ AML_NameChar ,
+ AML_Local0Op , // 20
+ AML_Local1Op ,
+ AML_Local2Op ,
+ AML_Local3Op ,
+ AML_Local4Op ,
+ AML_Local5Op ,
+ AML_Local6Op ,
+ AML_Local7Op ,
+ AML_Arg0Op ,
+ AML_Arg1Op ,
+ AML_Arg2Op ,//30
+ AML_Arg3Op ,
+ AML_Arg4Op ,
+ AML_Arg5Op ,
+ AML_Arg6Op ,
+ AML_StoreOp ,
+ AML_RefOfOp ,
+ AML_AddOp ,
+ AML_ConcatOp ,
+ AML_SubtractOp ,
+ AML_IncrementOp ,//40
+ AML_DecrementOp ,
+ AML_MultiplyOp ,
+ AML_DivideOp ,
+ AML_ShiftLeftOp ,
+ AML_ShiftRightOp ,
+ AML_AndOp ,
+ AML_NandOp ,
+ AML_OrOp ,
+ AML_NorOp ,
+ AML_XorOp ,//50
+ AML_NotOp ,
+ AML_FindSetLeftBitOp ,
+ AML_FindSetRightBitOp ,
+ AML_DerefOfOp ,
+ AML_ConcatResOp ,
+ AML_ModOp ,
+ AML_NotifyOp ,
+ AML_SizeOfOp ,
+ AML_IndexOp ,
+ AML_MatchOp ,//60
+ AML_CreateDWordFieldOp,
+ AML_CreateWordFieldOp ,
+ AML_CreateByteFieldOp ,
+ AML_CreateBitFieldOp ,
+ AML_TypeOp ,// 65
+ AML_CreateQWordFieldOp,
+ AML_LandOp ,
+ AML_LorOp ,
+ AML_LEqualOp ,
+ AML_LGreaterOp ,//70
+ AML_LLessOp ,
+ AML_ToBufferOp ,
+ AML_ToDecimalStringOp ,
+ AML_ToHexStringOp ,
+ AML_ToIntegerOp ,
+ AML_ToStringOp ,
+ AML_CopyObjectOp ,
+ AML_MidOp ,
+ AML_ContinueOp ,
+ AML_IfOp ,//80
+ AML_ElseOp ,
+ AML_WhileOp ,
+ AML_NoopOp ,
+ AML_ReturnOp ,
+ AML_BreakOp ,
+ AML_BreakPointOp ,
+ AML_OnesOp ,
+ AML_MutexOp ,
+ AML_EventOp ,
+ AML_CondRefOfOp ,//90
+ AML_CreateFieldOp ,
+ AML_LoadTableOp ,
+ AML_LoadOp ,
+ AML_StallOp ,
+ AML_SleepOp ,
+ AML_AcquireOp ,
+ AML_SignalOp ,
+ AML_WaitOp ,
+ AML_ResetOp ,
+ AML_ReleaseOp ,//100
+ AML_FromBCDOp ,
+ AML_ToBCD ,
+ AML_UnloadOp ,
+ AML_RevisionOp ,
+ AML_DebugOp ,
+ AML_FatalOp ,
+ AML_TimerOp ,
+ AML_OpRegionOp ,
+ AML_FieldOp ,
+ AML_DeviceOpList ,//110
+ AML_ProcessorOp ,
+ AML_PowerResOp ,
+ AML_ThermalZoneOpList ,
+ AML_IndexFieldOp ,
+ AML_BankFieldOp ,
+ AML_DataRegionOp ,
+ AML_LNotEqualOp ,
+ AML_LLessEqualOp ,
+ AML_LGreaterEqualOp ,
+ AML_Char ,//120
+ AML_Int ,
+
+} AMLOperation;

include/AMLParser.h

@@ -16,9 +16,9 @@
  */
 
 #pragma once
-
+#include <AMLOperations.h>
 #include "ACPIDesc.h"
-#include "AMLRouter.h"
+//#include "AMLRouter.h"
 
 typedef enum
 {

include/AMLRouter.h

@@ -19,132 +19,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-typedef enum
-{
- AML_Unknown , // 0
- AML_ZeroOp ,
- AML_OneOp ,
- AML_AliasOp ,
- AML_NameOp ,
- AML_BytePrefix ,
- AML_WordPrefix ,
- AML_DWordPrefix , // 7
- AML_StringPrefix ,
- AML_QWordPrefix ,
- AML_ScopeOp , // 10
- AML_BufferOp ,
- AML_PackageOp ,
- AML_VarPackageOp ,
- AML_MethodOp ,
- AML_DualNamePrefix ,
- AML_MultiNamePrefix ,//16
- AML_RootChar ,
- AML_ParentPrefixChar ,
- AML_NameChar ,
- AML_Local0Op , // 20
- AML_Local1Op ,
- AML_Local2Op ,
- AML_Local3Op ,
- AML_Local4Op ,
- AML_Local5Op ,
- AML_Local6Op ,
- AML_Local7Op ,
- AML_Arg0Op ,
- AML_Arg1Op ,
- AML_Arg2Op ,//30
- AML_Arg3Op ,
- AML_Arg4Op ,
- AML_Arg5Op ,
- AML_Arg6Op ,
- AML_StoreOp ,
- AML_RefOfOp ,
- AML_AddOp ,
- AML_ConcatOp ,
- AML_SubtractOp ,
- AML_IncrementOp ,//40
- AML_DecrementOp ,
- AML_MultiplyOp ,
- AML_DivideOp ,
- AML_ShiftLeftOp ,
- AML_ShiftRightOp ,
- AML_AndOp ,
- AML_NandOp ,
- AML_OrOp ,
- AML_NorOp ,
- AML_XorOp ,//50
- AML_NotOp ,
- AML_FindSetLeftBitOp ,
- AML_FindSetRightBitOp ,
- AML_DerefOfOp ,
- AML_ConcatResOp ,
- AML_ModOp ,
- AML_NotifyOp ,
- AML_SizeOfOp ,
- AML_IndexOp ,
- AML_MatchOp ,//60
- AML_CreateDWordFieldOp,
- AML_CreateWordFieldOp ,
- AML_CreateByteFieldOp ,
- AML_CreateBitFieldOp ,
- AML_TypeOp ,// 65
- AML_CreateQWordFieldOp,
- AML_LandOp ,
- AML_LorOp ,
- AML_LEqualOp ,
- AML_LGreaterOp ,//70
- AML_LLessOp ,
- AML_ToBufferOp ,
- AML_ToDecimalStringOp ,
- AML_ToHexStringOp ,
- AML_ToIntegerOp ,
- AML_ToStringOp ,
- AML_CopyObjectOp ,
- AML_MidOp ,
- AML_ContinueOp ,
- AML_IfOp ,//80
- AML_ElseOp ,
- AML_WhileOp ,
- AML_NoopOp ,
- AML_ReturnOp ,
- AML_BreakOp ,
- AML_BreakPointOp ,
- AML_OnesOp ,
- AML_MutexOp ,
- AML_EventOp ,
- AML_CondRefOfOp ,//90
- AML_CreateFieldOp ,
- AML_LoadTableOp ,
- AML_LoadOp ,
- AML_StallOp ,
- AML_SleepOp ,
- AML_AcquireOp ,
- AML_SignalOp ,
- AML_WaitOp ,
- AML_ResetOp ,
- AML_ReleaseOp ,//100
- AML_FromBCDOp ,
- AML_ToBCD ,
- AML_UnloadOp ,
- AML_RevisionOp ,
- AML_DebugOp ,
- AML_FatalOp ,
- AML_TimerOp ,
- AML_OpRegionOp ,
- AML_FieldOp ,
- AML_DeviceOpList ,//110
- AML_ProcessorOp ,
- AML_PowerResOp ,
- AML_ThermalZoneOpList ,
- AML_IndexFieldOp ,
- AML_BankFieldOp ,
- AML_DataRegionOp ,
- AML_LNotEqualOp ,
- AML_LLessEqualOp ,
- AML_LGreaterEqualOp ,
- AML_Char ,//120
- AML_Int ,
-
-} AMLOperation;
+#include <AMLOperations.h>
 
 
 AMLOperation _GetNextOp(/*AMLParserState* state ,*/ const uint8_t* buffer , size_t bufSize , size_t* advance , size_t offset);

libACPI.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
  objects = {
 
 /* Begin PBXBuildFile section */
+ 5900C6CA227C0A6F00A3C29F /* AMLOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 5900C6C9227C0A6F00A3C29F /* AMLOperations.h */; settings = {ATTRIBUTES = (Public, ); }; };
  590D3EBE225A0DF900E2525E /* AMLMethodParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 590D3EBC225A0DF900E2525E /* AMLMethodParser.h */; };
  590D3EBF225A0DF900E2525E /* AMLMethodParser.c in Sources */ = {isa = PBXBuildFile; fileRef = 590D3EBD225A0DF900E2525E /* AMLMethodParser.c */; };
  592B51EB224C9EBE00D6B135 /* AMLDecompilerDefaultCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 592B51E9224C9EBE00D6B135 /* AMLDecompilerDefaultCallbacks.h */; };
@@ -96,6 +97,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+ 5900C6C9227C0A6F00A3C29F /* AMLOperations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AMLOperations.h; sourceTree = "<group>"; };
  590D3EBC225A0DF900E2525E /* AMLMethodParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AMLMethodParser.h; sourceTree = "<group>"; };
  590D3EBD225A0DF900E2525E /* AMLMethodParser.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = AMLMethodParser.c; sourceTree = "<group>"; };
  592B51E9224C9EBE00D6B135 /* AMLDecompilerDefaultCallbacks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AMLDecompilerDefaultCallbacks.h; sourceTree = "<group>"; };
@@ -281,6 +283,7 @@
  59459A7321DF51C900DD9396 /* AMLDecompiler.h */,
  59459A5C21DE269000DD9396 /* ACPIDesc.h */,
  59459AC52204175900DD9396 /* AMLTypes.h */,
+ 5900C6C9227C0A6F00A3C29F /* AMLOperations.h */,
  59459A8E21E7274200DD9396 /* AMLParser.h */,
  59459A8D21E7274200DD9396 /* AMLRouter.h */,
  59459A5D21DE269000DD9396 /* EISAID.h */,
@@ -353,6 +356,7 @@
  59459A7421DF51C900DD9396 /* AMLDecompiler.h in Headers */,
  59459ADC22173F5B00DD9396 /* AMLBufferInterpreter.h in Headers */,
  59459A9121E7279C00DD9396 /* AMLHelpers.h in Headers */,
+ 5900C6CA227C0A6F00A3C29F /* AMLOperations.h in Headers */,
  );
  runOnlyForDeploymentPostprocessing = 0;
  };