add km/ata.py

Dobatymo · Jun 12, 2024 · 833feac · 833feac
1 parent 56f330d
commit 833feac
Show file tree

Hide file tree

Showing 7 changed files with 3,010 additions and 10 deletions.
diff --git a/cwinsdk/km/ata.py b/cwinsdk/km/ata.py
diff --git a/cwinsdk/shared/ntddscsi.py b/cwinsdk/shared/ntddscsi.py
@@ -1,7 +1,6 @@
 from ctypes import POINTER, Structure
 from ctypes.wintypes import LPVOID, ULONG, USHORT
 
-from ..um.winnt import ANYSIZE_ARRAY
 from .basetsd import ULONG_PTR
 from .devioctl import (
     CTL_CODE,
@@ -11,7 +10,7 @@
     FILE_WRITE_ACCESS,
     METHOD_BUFFERED,
 )
-from .ntdef import PVOID, UCHAR
+from .ntdef import ANYSIZE_ARRAY, PVOID, UCHAR
 
 IOCTL_SCSI_BASE = FILE_DEVICE_CONTROLLER
 FILE_DEVICE_SCSI = 0x0000001B

diff --git a/cwinsdk/shared/ntdef.py b/cwinsdk/shared/ntdef.py
@@ -14,6 +14,8 @@
 )
 from ctypes.wintypes import HANDLE, WCHAR
 
+ANYSIZE_ARRAY = 1  # winnt
+
 PWCHAR = POINTER(WCHAR)
 LPWCH = POINTER(WCHAR)
 PWCH = POINTER(WCHAR)

diff --git a/cwinsdk/shared/nvme.py b/cwinsdk/shared/nvme.py
@@ -1,10 +1,9 @@
 from ctypes import POINTER, Structure, Union, sizeof
 from ctypes.wintypes import CHAR, ULONG, USHORT
 
-from cwinsdk import CEnum, make_struct, make_union
-from cwinsdk.shared.guiddef import GUID
-from cwinsdk.shared.ntdef import UCHAR, ULONGLONG
-from cwinsdk.um.winnt import ANYSIZE_ARRAY
+from .. import CEnum, make_struct, make_union
+from .guiddef import GUID
+from .ntdef import ANYSIZE_ARRAY, UCHAR, ULONGLONG
 
 _pack_ = 0
 """++

diff --git a/cwinsdk/windows.py b/cwinsdk/windows.py
@@ -1,3 +1,4 @@
+from .km.ata import *
 from .km.crt.excpt import *
 from .km.dderror import *
 from .km.wdm import *

diff --git a/transpile/transpile.py b/transpile/transpile.py
@@ -17,6 +17,7 @@ def main(args: Namespace) -> None:
         "shared/scsi.h",
         "um/wingdi.h",
         "um/winioctl.h",
+        "km/ata.h",
     ]
     header_files = list(map(Path, header_files))
 

diff --git a/transpile/utils.py b/transpile/utils.py
@@ -691,17 +691,16 @@ def typedef_sub(m: re.Match) -> str:
     ],
     Path("shared/ntddscsi.h"): [],
     Path("shared/nvme.h"): [
-        ["cwinsdk.shared.ntdef", ["LPWCH", "PWSTR", "ULONGLONG", "UCHAR", "PVOID"]],
-        ["cwinsdk.um.winnt", ["ANYSIZE_ARRAY"]],
+        ["cwinsdk.shared.ntdef", ["ANYSIZE_ARRAY", "LPWCH", "PWSTR", "ULONGLONG", "UCHAR", "PVOID"]],
         ["cwinsdk.shared.guiddef", ["GUID"]],
     ],
     Path("shared/scsi.h"): [
         ["cwinsdk", ["DECLSPEC_ALIGN"]],
-        ["cwinsdk.shared.ntdef", ["UCHAR", "ULONGLONG"]],
-        ["cwinsdk.um.winnt", ["ANYSIZE_ARRAY"]],
+        ["cwinsdk.shared.ntdef", ["ANYSIZE_ARRAY", "UCHAR", "ULONGLONG"]],
     ],
     Path("shared/ntddscsi.h"): [],
     Path("shared/winioctl.h"): [],
+    Path("km/ata.h"): [["cwinsdk.shared.ntdef", ["UCHAR", "ULONGLONG", "ANYSIZE_ARRAY"]]],
 }