Author: fireball
Date: Mon Apr 6 18:38:21 2009
New Revision: 40393
URL: http://svn.reactos.org/svn/reactos?rev=40393&view=rev
Log:
- Specify NTAPI for all functions without calling convention specified (Alexey
Komarov <[email protected]>).
- Remove (unsupported) -mrtd compiler flag.
Modified:
trunk/reactos/drivers/storage/ide/uniata/atapi.h
trunk/reactos/drivers/storage/ide/uniata/badblock.h
trunk/reactos/drivers/storage/ide/uniata/bsmaster.h
trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp
trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp
trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp
trunk/reactos/drivers/storage/ide/uniata/id_init.cpp
trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp
trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp
trunk/reactos/drivers/storage/ide/uniata/id_queue.h
trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp
trunk/reactos/drivers/storage/ide/uniata/id_sata.h
trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h
trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild
Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/atapi.h?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Mon Apr 6
18:38:21 2009
@@ -984,18 +984,21 @@
#ifndef USER_MODE
PSCSI_REQUEST_BLOCK
+NTAPI
BuildMechanismStatusSrb (
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
);
PSCSI_REQUEST_BLOCK
+NTAPI
BuildRequestSenseSrb (
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
);
VOID
+NTAPI
AtapiHwInitializeChanger (
IN PVOID HwDeviceExtension,
IN ULONG TargetId,
@@ -1003,6 +1006,7 @@
);
ULONG
+NTAPI
AtapiSendCommand(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -1010,6 +1014,7 @@
);
ULONG
+NTAPI
IdeSendCommand(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -1019,6 +1024,7 @@
#define AtapiCopyMemory RtlCopyMemory
VOID
+NTAPI
AtapiHexToString (
ULONG Value,
PCHAR *Buffer
@@ -1027,28 +1033,33 @@
#define AtapiStringCmp(s1, s2, n) _strnicmp(s1, s2, n)
BOOLEAN
+NTAPI
AtapiInterrupt(
IN PVOID HwDeviceExtension
);
BOOLEAN
+NTAPI
AtapiInterrupt__(
IN PVOID HwDeviceExtension,
IN UCHAR c
);
BOOLEAN
+NTAPI
AtapiHwInitialize(
IN PVOID HwDeviceExtension
);
ULONG
+NTAPI
IdeBuildSenseBuffer(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
);
VOID
+NTAPI
IdeMediaStatus(
IN BOOLEAN EnableMSN,
IN PVOID HwDeviceExtension,
@@ -1066,12 +1077,14 @@
);
ULONG
+NTAPI
AtapiParseArgumentString(
IN PCCH String,
IN PCCH KeyWord
);
BOOLEAN
+NTAPI
IssueIdentify(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1081,6 +1094,7 @@
);
BOOLEAN
+NTAPI
SetDriveParameters(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1088,6 +1102,7 @@
);
ULONG
+NTAPI
CheckDevice(
IN PVOID HwDeviceExtension,
IN ULONG Channel,
@@ -1098,6 +1113,7 @@
#define UNIATA_FIND_DEV_UNHIDE 0x01
BOOLEAN
+NTAPI
FindDevices(
IN PVOID HwDeviceExtension,
IN ULONG Flags,
@@ -1113,18 +1129,21 @@
#ifndef USER_MODE
BOOLEAN
+NTAPI
AtapiResetController(
IN PVOID HwDeviceExtension,
IN ULONG PathId
);
BOOLEAN
+NTAPI
AtapiStartIo(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
);
BOOLEAN
+NTAPI
AtapiStartIo__(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -1132,6 +1151,7 @@
);
extern UCHAR
+NTAPI
AtaCommand48(
// IN PVOID HwDeviceExtension,
IN struct _HW_DEVICE_EXTENSION* deviceExtension,
@@ -1145,6 +1165,7 @@
);
extern UCHAR
+NTAPI
AtaCommand(
// IN PVOID HwDeviceExtension,
IN struct _HW_DEVICE_EXTENSION* deviceExtension,
@@ -1160,15 +1181,19 @@
);
extern LONG
+NTAPI
AtaPioMode(PIDENTIFY_DATA2 ident);
extern LONG
+NTAPI
AtaWmode(PIDENTIFY_DATA2 ident);
extern LONG
+NTAPI
AtaUmode(PIDENTIFY_DATA2 ident);
extern VOID
+NTAPI
AtapiDpcDispatch(
IN PKDPC Dpc,
IN PVOID DeferredContext,
@@ -1179,18 +1204,22 @@
//#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg)
extern LONG
+NTAPI
AtaPio2Mode(LONG pio);
extern LONG
+NTAPI
AtaPioMode(PIDENTIFY_DATA2 ident);
extern VOID
+NTAPI
AtapiEnableInterrupts(
IN PVOID HwDeviceExtension,
IN ULONG c
);
extern VOID
+NTAPI
AtapiDisableInterrupts(
IN PVOID HwDeviceExtension,
IN ULONG c
@@ -1202,6 +1231,7 @@
#define IOMODE_NOT_SPECIFIED (0xffffffffL)
extern ULONG
+NTAPI
AtapiRegCheckDevValue(
IN PVOID HwDeviceExtension,
IN ULONG chan,
@@ -1211,6 +1241,7 @@
);
extern ULONG
+NTAPI
AtapiRegCheckParameterValue(
IN PVOID HwDeviceExtension,
IN PCWSTR PathSuffix,
@@ -1218,7 +1249,7 @@
IN ULONG Default
);
-extern ULONG g_LogToDisplay;
+extern ULONG g_LogToDisplay;
extern "C"
VOID
@@ -1229,6 +1260,7 @@
);
VOID
+NTAPI
UniataInitMapBM(
IN struct _HW_DEVICE_EXTENSION* deviceExtension,
IN struct _IDE_BUSMASTER_REGISTERS* BaseIoAddressBM_0,
@@ -1236,6 +1268,7 @@
);
VOID
+NTAPI
UniataInitMapBase(
IN struct _HW_CHANNEL* chan,
IN PIDE_REGISTERS_1 BaseIoAddress1,
@@ -1243,6 +1276,7 @@
);
VOID
+NTAPI
UniataInitSyncBaseIO(
IN struct _HW_CHANNEL* chan
);
@@ -1255,11 +1289,13 @@
);
VOID
+NTAPI
UniataDumpATARegs(
IN struct _HW_CHANNEL* chan
);
ULONG
+NTAPI
EncodeVendorStr(
OUT PWCHAR Buffer,
IN PUCHAR Str,
@@ -1267,12 +1303,14 @@
);
ULONGLONG
+NTAPI
UniAtaCalculateLBARegsBack(
struct _HW_LU_EXTENSION* LunExt,
ULONGLONG lba
);
BOOLEAN
+NTAPI
UniataAnybodyHome(
IN PVOID HwDeviceExtension,
IN ULONG Channel,
Modified: trunk/reactos/drivers/storage/ide/uniata/badblock.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/badblock.h?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/badblock.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/badblock.h [iso-8859-1] Mon Apr 6
18:38:21 2009
@@ -58,16 +58,19 @@
#pragma pack(pop)
void
+NTAPI
InitBadBlocks(
IN PHW_LU_EXTENSION LunExt
);
void
+NTAPI
ForgetBadBlocks(
IN PHW_LU_EXTENSION LunExt
);
bool
+NTAPI
CheckIfBadBlock(
IN PHW_LU_EXTENSION LunExt,
// IN UCHAR command,
Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/bsmaster.h?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Mon Apr 6
18:38:21 2009
@@ -1009,6 +1009,7 @@
//extern const CHAR retry_Udma[MAX_RETRIES+1];
extern VOID
+NTAPI
UniataEnumBusMasterController(
IN PVOID DriverObject,
PVOID Argument2
@@ -1037,6 +1038,7 @@
#define UNIATA_ALLOCATE_NEW_LUNS 0x00
extern BOOLEAN
+NTAPI
UniataAllocateLunExt(
PHW_DEVICE_EXTENSION deviceExtension,
ULONG NewNumberChannels
@@ -1063,16 +1065,19 @@
);
extern NTSTATUS
+NTAPI
UniataConnectIntr2(
IN PVOID HwDeviceExtension
);
extern NTSTATUS
+NTAPI
UniataDisconnectIntr2(
IN PVOID HwDeviceExtension
);
extern ULONG
+NTAPI
ScsiPortGetBusDataByOffset(
IN PVOID HwDeviceExtension,
IN BUS_DATA_TYPE BusDataType,
@@ -1087,6 +1092,7 @@
#define PCISLOTNUM_NOT_SPECIFIED (0xffffffffL)
extern ULONG
+NTAPI
AtapiFindListedDev(
PBUSMASTER_CONTROLLER_INFORMATION BusMasterAdapters,
ULONG lim,
@@ -1097,6 +1103,7 @@
);
extern ULONG
+NTAPI
AtapiFindDev(
IN PVOID HwDeviceExtension,
IN BUS_DATA_TYPE BusDataType,
@@ -1107,6 +1114,7 @@
);
extern VOID
+NTAPI
AtapiDmaAlloc(
IN PVOID HwDeviceExtension,
IN PPORT_CONFIGURATION_INFORMATION ConfigInfo,
@@ -1114,6 +1122,7 @@
);
extern BOOLEAN
+NTAPI
AtapiDmaSetup(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1124,6 +1133,7 @@
);
extern BOOLEAN
+NTAPI
AtapiDmaPioSync(
PVOID HwDeviceExtension,
PSCSI_REQUEST_BLOCK Srb,
@@ -1132,12 +1142,14 @@
);
extern BOOLEAN
+NTAPI
AtapiDmaDBSync(
PHW_CHANNEL chan,
PSCSI_REQUEST_BLOCK Srb
);
extern VOID
+NTAPI
AtapiDmaStart(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1146,6 +1158,7 @@
);
extern UCHAR
+NTAPI
AtapiDmaDone(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1154,6 +1167,7 @@
);
extern VOID
+NTAPI
AtapiDmaReinit(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG ldev,
@@ -1161,12 +1175,14 @@
);
extern VOID
+NTAPI
AtapiDmaInit__(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG ldev
);
extern VOID
+NTAPI
AtapiDmaInit(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1186,6 +1202,7 @@
extern PDRIVER_OBJECT SavedDriverObject;
extern BOOLEAN
+NTAPI
UniataChipDetectChannels(
IN PVOID HwDeviceExtension,
IN PPCI_COMMON_CONFIG pciData, // optional
@@ -1194,6 +1211,7 @@
);
extern BOOLEAN
+NTAPI
UniataChipDetect(
IN PVOID HwDeviceExtension,
IN PPCI_COMMON_CONFIG pciData, // optional
@@ -1203,6 +1221,7 @@
);
extern BOOLEAN
+NTAPI
AtapiChipInit(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1210,6 +1229,7 @@
);
extern ULONG
+NTAPI
AtapiGetIoRange(
IN PVOID HwDeviceExtension,
IN PPORT_CONFIGURATION_INFORMATION ConfigInfo,
@@ -1462,6 +1482,7 @@
}
BOOLEAN
+NTAPI
AtapiReadChipConfig(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1469,6 +1490,7 @@
);
VOID
+NTAPI
UniataForgetDevice(
PHW_LU_EXTENSION LunExt
);
Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Apr 6
18:38:21 2009
@@ -102,6 +102,7 @@
);
VOID
+NTAPI
AtapiHwInitialize__(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG lChannel
@@ -140,6 +141,7 @@
);
VOID
+NTAPI
AtapiQueueTimerDpc(
IN PVOID HwDeviceExtension,
IN ULONG lChannel,
@@ -158,6 +160,7 @@
#endif //UNIATA_CORE
BOOLEAN
+NTAPI
AtapiCheckInterrupt__(
IN PVOID HwDeviceExtension,
IN UCHAR c
@@ -167,6 +170,7 @@
#ifndef UNIATA_CORE
BOOLEAN
+NTAPI
AtapiRegGetStringParameterValue(
IN PWSTR RegistryPath,
IN PWSTR Name,
@@ -718,6 +722,7 @@
Translate to 48-Lba form if required
*/
UCHAR
+NTAPI
AtaCommand48(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG DeviceNumber,
@@ -896,6 +901,7 @@
This is simply wrapper for AtaCommand48()
*/
UCHAR
+NTAPI
AtaCommand(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG DeviceNumber,
@@ -916,6 +922,7 @@
} // end AtaCommand()
LONG
+NTAPI
AtaPio2Mode(LONG pio)
{
switch (pio) {
@@ -930,6 +937,7 @@
} // end AtaPio2Mode()
LONG
+NTAPI
AtaPioMode(PIDENTIFY_DATA2 ident)
{
if (ident->PioTimingsValid) {
@@ -950,6 +958,7 @@
} // end AtaPioMode()
LONG
+NTAPI
AtaWmode(PIDENTIFY_DATA2 ident)
{
if (ident->MultiWordDMASupport & 0x04)
@@ -962,6 +971,7 @@
} // end AtaWmode()
LONG
+NTAPI
AtaUmode(PIDENTIFY_DATA2 ident)
{
if (!ident->UdmaModesValid)
@@ -1067,6 +1077,7 @@
cancels previous Dpc request (if any), but we need Dpc queue.
*/
VOID
+NTAPI
AtapiQueueTimerDpc(
IN PVOID HwDeviceExtension,
IN ULONG lChannel,
@@ -1128,6 +1139,7 @@
#endif //UNIATA_CORE
VOID
+NTAPI
UniataDumpATARegs(
IN PHW_CHANNEL chan
)
@@ -1175,6 +1187,7 @@
--*/
BOOLEAN
+NTAPI
IssueIdentify(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1769,6 +1782,7 @@
--*/
BOOLEAN
+NTAPI
SetDriveParameters(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1811,6 +1825,7 @@
} // end SetDriveParameters()
VOID
+NTAPI
UniataForgetDevice(
PHW_LU_EXTENSION LunExt
)
@@ -1845,6 +1860,7 @@
BOOLEAN
+NTAPI
AtapiResetController__(
IN PVOID HwDeviceExtension,
IN ULONG PathId,
@@ -2193,6 +2209,7 @@
--*/
ULONG
+NTAPI
MapError(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
@@ -2604,6 +2621,7 @@
} // end AtapiHwInitialize()
VOID
+NTAPI
AtapiHwInitialize__(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG lChannel
@@ -2826,6 +2844,7 @@
#ifndef UNIATA_CORE
VOID
+NTAPI
AtapiHwInitializeChanger(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -2860,6 +2879,7 @@
--*/
ULONG
+NTAPI
AtapiParseArgumentString(
IN PCCH String,
IN PCCH KeyWord
@@ -3026,6 +3046,7 @@
Timer callback
*/
VOID
+NTAPI
AtapiCallBack__(
IN PVOID HwDeviceExtension,
IN UCHAR lChannel
@@ -3155,6 +3176,7 @@
} // end AtapiCallBack__()
VOID
+NTAPI
AtapiCallBack_X(
IN PVOID HwDeviceExtension
)
@@ -3300,6 +3322,7 @@
#ifndef UNIATA_CORE
BOOLEAN
+NTAPI
AtapiInterrupt2(
IN PKINTERRUPT Interrupt,
IN PVOID Isr2HwDeviceExtension
@@ -3470,6 +3493,7 @@
VOID
+NTAPI
AtapiEnableInterrupts(
IN PVOID HwDeviceExtension,
IN ULONG c
@@ -3492,6 +3516,7 @@
} // end AtapiEnableInterrupts()
VOID
+NTAPI
AtapiDisableInterrupts(
IN PVOID HwDeviceExtension,
IN ULONG c
@@ -3517,6 +3542,7 @@
Check hardware for interrupt state
*/
BOOLEAN
+NTAPI
AtapiCheckInterrupt__(
IN PVOID HwDeviceExtension,
IN UCHAR c // logical channel
@@ -3895,6 +3921,7 @@
BOOLEAN
+NTAPI
AtapiInterrupt__(
IN PVOID HwDeviceExtension,
IN UCHAR c
@@ -5281,6 +5308,7 @@
--*/
ULONG
+NTAPI
IdeSendSmartCommand(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
@@ -5394,6 +5422,7 @@
#endif //UNIATA_CORE
ULONGLONG
+NTAPI
UniAtaCalculateLBARegs(
PHW_LU_EXTENSION LunExt,
ULONG startingSector,
@@ -5434,6 +5463,7 @@
} // end UniAtaCalculateLBARegs()
ULONGLONG
+NTAPI
UniAtaCalculateLBARegsBack(
PHW_LU_EXTENSION LunExt,
ULONGLONG lba
@@ -5478,6 +5508,7 @@
--*/
ULONG
+NTAPI
IdeReadWrite(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -5736,6 +5767,7 @@
--*/
ULONG
+NTAPI
IdeVerify(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
@@ -5837,6 +5869,7 @@
--*/
ULONG
+NTAPI
AtapiSendCommand(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -6409,6 +6442,7 @@
#endif
ULONG
+NTAPI
IdeSendCommand(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -7003,6 +7037,7 @@
--*/
VOID
+NTAPI
IdeMediaStatus(
BOOLEAN EnableMSN,
IN PVOID HwDeviceExtension,
@@ -7077,6 +7112,7 @@
--*/
ULONG
+NTAPI
IdeBuildSenseBuffer(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
@@ -7129,6 +7165,7 @@
}// End of IdeBuildSenseBuffer
VOID
+NTAPI
UniataUserDeviceReset(
PHW_DEVICE_EXTENSION deviceExtension,
PHW_LU_EXTENSION LunExt,
@@ -7152,6 +7189,7 @@
} // end UniataUserDeviceReset()
BOOLEAN
+NTAPI
UniataNeedQueueing(
PHW_DEVICE_EXTENSION deviceExtension,
PHW_CHANNEL chan,
@@ -7214,6 +7252,7 @@
} // end AtapiStartIo()
BOOLEAN
+NTAPI
AtapiStartIo__(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -8163,6 +8202,7 @@
void
+NTAPI
UniataInitAtaCommands()
{
int i;
@@ -8666,6 +8706,7 @@
PSCSI_REQUEST_BLOCK
+NTAPI
BuildMechanismStatusSrb(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
@@ -8707,6 +8748,7 @@
#endif //UNIATA_CORE
PSCSI_REQUEST_BLOCK
+NTAPI
BuildRequestSenseSrb (
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
@@ -8748,6 +8790,7 @@
#ifndef UNIATA_CORE
ULONG
+NTAPI
AtapiRegCheckDevLunValue(
IN PVOID HwDeviceExtension,
IN PCWCH NamePrefix,
@@ -8777,6 +8820,7 @@
} // end AtapiRegCheckDevLunValue()
ULONG
+NTAPI
EncodeVendorStr(
OUT PWCHAR Buffer,
IN PUCHAR Str,
@@ -8816,6 +8860,7 @@
} // end EncodeVendorStr()
ULONG
+NTAPI
AtapiRegCheckDevValue(
IN PVOID HwDeviceExtension,
IN ULONG chan,
@@ -8936,6 +8981,7 @@
Returns: Registry Key value
*/
ULONG
+NTAPI
AtapiRegCheckParameterValue(
IN PVOID HwDeviceExtension,
IN PCWSTR PathSuffix,
Modified: trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1]
(original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1] Mon
Apr 6 18:38:21 2009
@@ -122,6 +122,7 @@
void
+NTAPI
InitBadBlocks(
IN PHW_LU_EXTENSION LunExt
)
@@ -222,6 +223,7 @@
void
+NTAPI
ForgetBadBlocks(
IN PHW_LU_EXTENSION LunExt
)
@@ -235,6 +237,7 @@
} // end ForgetBadBlocks()
bool
+NTAPI
CheckIfBadBlock(
IN PHW_LU_EXTENSION LunExt,
// IN UCHAR command,
Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Apr 6
18:38:21 2009
@@ -53,6 +53,7 @@
PHYSICAL_ADDRESS ph4gb = {{0xFFFFFFFF, 0}};
VOID
+NTAPI
cyrix_timing (
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG dev, // physical device number (0-3)
@@ -60,6 +61,7 @@
);
VOID
+NTAPI
promise_timing (
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG dev, // physical device number (0-3)
@@ -67,6 +69,7 @@
);
VOID
+NTAPI
hpt_timing (
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG dev, // physical device number (0-3)
@@ -74,6 +77,7 @@
);
VOID
+NTAPI
via82c_timing (
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG dev, // physical device number (0-3)
@@ -81,6 +85,7 @@
);
ULONG
+NTAPI
hpt_cable80(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG channel // physical channel number (0-1)
@@ -89,6 +94,7 @@
#define ATAPI_DEVICE(de, ldev) (de->lun[ldev].DeviceFlags &
DFLAGS_ATAPI_DEVICE)
ULONG
+NTAPI
AtapiVirtToPhysAddr_(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -124,6 +130,7 @@
} // end AtapiVirtToPhysAddr_()
VOID
+NTAPI
AtapiDmaAlloc(
IN PVOID HwDeviceExtension,
IN PPORT_CONFIGURATION_INFORMATION ConfigInfo,
@@ -204,6 +211,7 @@
} // end AtapiDmaAlloc()
BOOLEAN
+NTAPI
AtapiDmaSetup(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -352,6 +360,7 @@
} // end AtapiDmaSetup()
BOOLEAN
+NTAPI
AtapiDmaPioSync(
PVOID HwDeviceExtension,
PSCSI_REQUEST_BLOCK Srb,
@@ -416,6 +425,7 @@
} // end AtapiDmaPioSync()
BOOLEAN
+NTAPI
AtapiDmaDBSync(
PHW_CHANNEL chan,
PSCSI_REQUEST_BLOCK Srb
@@ -436,6 +446,7 @@
} // end AtapiDmaDBSync()
VOID
+NTAPI
AtapiDmaStart(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -528,6 +539,7 @@
} // end AtapiDmaStart()
UCHAR
+NTAPI
AtapiDmaDone(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -589,6 +601,7 @@
} // end AtapiDmaDone()
VOID
+NTAPI
AtapiDmaReinit(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG ldev,
@@ -671,6 +684,7 @@
} // end AtapiDmaReinit()
VOID
+NTAPI
AtapiDmaInit__(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG ldev
@@ -706,6 +720,7 @@
} // end AtapiDmaInit__()
BOOLEAN
+NTAPI
AtaSetTransferMode(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG DeviceNumber,
@@ -749,6 +764,7 @@
} // end AtaSetTransferMode()
VOID
+NTAPI
AtapiDmaInit(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1796,6 +1812,7 @@
VOID
+NTAPI
cyrix_timing(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG dev, // physical device number (0-3)
@@ -1825,6 +1842,7 @@
} // cyrix_timing()
VOID
+NTAPI
promise_timing(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG dev, // physical device number (0-3)
@@ -1888,6 +1906,7 @@
VOID
+NTAPI
hpt_timing(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG dev, // physical device number (0-3)
@@ -2032,6 +2051,7 @@
#define FIT(v,min,max) (((v)>(max)?(max):(v))<(min)?(min):(v))
VOID
+NTAPI
via82c_timing(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG dev, // physical device number (0-3)
Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_init.cpp?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Mon Apr
6 18:38:21 2009
@@ -44,6 +44,7 @@
#include "stdafx.h"
BOOLEAN
+NTAPI
UniataChipDetectChannels(
IN PVOID HwDeviceExtension,
IN PPCI_COMMON_CONFIG pciData, // optional
@@ -140,6 +141,7 @@
} // end UniataChipDetectChannels()
BOOLEAN
+NTAPI
UniataChipDetect(
IN PVOID HwDeviceExtension,
IN PPCI_COMMON_CONFIG pciData, // optional
@@ -916,6 +918,7 @@
This will prevent data losses
*/
VOID
+NTAPI
AtapiViaSouthBridgeFixup(
IN PVOID HwDeviceExtension,
IN BUS_DATA_TYPE BusDataType,
@@ -980,6 +983,7 @@
This will prevent data losses
*/
VOID
+NTAPI
AtapiRosbSouthBridgeFixup(
IN PVOID HwDeviceExtension,
IN BUS_DATA_TYPE BusDataType,
@@ -1031,6 +1035,7 @@
This will prevent data losses
*/
VOID
+NTAPI
AtapiAliSouthBridgeFixup(
IN PVOID HwDeviceExtension,
IN BUS_DATA_TYPE BusDataType,
@@ -1082,6 +1087,7 @@
} // end AtapiRosbSouthBridgeFixup()
ULONG
+NTAPI
hpt_cable80(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG channel // physical channel number (0-1)
@@ -1116,6 +1122,7 @@
ULONG
+NTAPI
via_cable80(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG channel // physical channel number (0-1)
@@ -1163,6 +1170,7 @@
} // end via_cable80()
BOOLEAN
+NTAPI
generic_cable80(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG channel, // physical channel number (0-1)
@@ -1192,6 +1200,7 @@
} // end generic_cable80()
VOID
+NTAPI
UniAtaReadLunConfig(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG channel, // physical channel
@@ -1241,6 +1250,7 @@
} // end UniAtaReadLunConfig()
BOOLEAN
+NTAPI
AtapiReadChipConfig(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1322,6 +1332,7 @@
} // end AtapiReadChipConfig()
BOOLEAN
+NTAPI
AtapiChipInit(
IN PVOID HwDeviceExtension,
IN ULONG DeviceNumber,
@@ -1880,6 +1891,7 @@
} // end AtapiChipInit()
VOID
+NTAPI
UniataInitMapBM(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN PIDE_BUSMASTER_REGISTERS BaseIoAddressBM_0,
@@ -1906,6 +1918,7 @@
} // end UniataInitMapBM()
VOID
+NTAPI
UniataInitMapBase(
IN PHW_CHANNEL chan,
IN PIDE_REGISTERS_1 BaseIoAddress1,
@@ -1926,6 +1939,7 @@
} // end UniataInitMapBase()
VOID
+NTAPI
UniataInitSyncBaseIO(
IN PHW_CHANNEL chan
)
Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1]
(original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Mon Apr
6 18:38:21 2009
@@ -64,6 +64,7 @@
// local routines
ULONG
+NTAPI
UniataEnumBusMasterController__(
/* IN PVOID HwDeviceExtension,
IN PVOID Context,
@@ -74,6 +75,7 @@
);
VOID
+NTAPI
AtapiDoNothing(VOID)
{
return;
@@ -85,6 +87,7 @@
Get PCI address by ConfigInfo and RID
*/
ULONG
+NTAPI
AtapiGetIoRange(
IN PVOID HwDeviceExtension,
IN PPORT_CONFIGURATION_INFORMATION ConfigInfo,
@@ -163,6 +166,7 @@
Hal routines directly in order to scan PCI bus.
*/
VOID
+NTAPI
UniataEnumBusMasterController(
IN PVOID DriverObject,
PVOID Argument2
@@ -173,6 +177,7 @@
} // end UniataEnumBusMasterController()
BOOLEAN
+NTAPI
UniataCheckPCISubclass(
BOOLEAN known,
ULONG RaidFlags,
@@ -212,6 +217,7 @@
Builds PCI device list using Hal routines (not ScsiPort wrappers)
*/
ULONG
+NTAPI
UniataEnumBusMasterController__(
)
{
@@ -560,6 +566,7 @@
Wrapper for read PCI config space
*/
ULONG
+NTAPI
ScsiPortGetBusDataByOffset(
IN PVOID HwDeviceExtension,
IN BUS_DATA_TYPE BusDataType,
@@ -598,6 +605,7 @@
If no matching record found, -1 is returned
*/
ULONG
+NTAPI
AtapiFindListedDev(
PBUSMASTER_CONTROLLER_INFORMATION BusMasterAdapters,
ULONG lim,
@@ -676,6 +684,7 @@
on specified Bus/Slot
*/
ULONG
+NTAPI
AtapiFindDev(
IN PVOID HwDeviceExtension,
IN BUS_DATA_TYPE BusDataType,
@@ -728,6 +737,7 @@
ULONG
+NTAPI
UniataFindCompatBusMasterController1(
IN PVOID HwDeviceExtension,
IN PVOID Context,
@@ -748,6 +758,7 @@
} // end UniataFindCompatBusMasterController1()
ULONG
+NTAPI
UniataFindCompatBusMasterController2(
IN PVOID HwDeviceExtension,
IN PVOID Context,
@@ -768,6 +779,7 @@
} // end UniataFindCompatBusMasterController2()
BOOLEAN
+NTAPI
UniataAllocateLunExt(
PHW_DEVICE_EXTENSION deviceExtension,
ULONG NewNumberChannels
@@ -828,6 +840,7 @@
--*/
ULONG
+NTAPI
UniataFindBusMasterController(
IN PVOID HwDeviceExtension,
IN PVOID Context,
@@ -1705,6 +1718,7 @@
This is for claiming PCI Busmaster in compatible mode under WDM OSes
*/
ULONG
+NTAPI
UniataFindFakeBusMasterController(
IN PVOID HwDeviceExtension,
IN PVOID Context,
@@ -2045,6 +2059,7 @@
--*/
NTSTATUS
+NTAPI
UniataConnectIntr2(
IN PVOID HwDeviceExtension
)
@@ -2147,6 +2162,7 @@
} // end UniataConnectIntr2()
NTSTATUS
+NTAPI
UniataDisconnectIntr2(
IN PVOID HwDeviceExtension
)
@@ -2198,6 +2214,7 @@
--*/
ULONG
+NTAPI
AtapiFindController(
IN PVOID HwDeviceExtension,
IN PVOID Context,
@@ -2614,6 +2631,7 @@
} // end AtapiFindController()
BOOLEAN
+NTAPI
UniataAnybodyHome(
IN PVOID HwDeviceExtension,
IN ULONG lChannel,
@@ -2689,6 +2707,7 @@
} // end UniataAnybodyHome()
ULONG
+NTAPI
CheckDevice(
IN PVOID HwDeviceExtension,
IN ULONG lChannel,
@@ -2873,6 +2892,7 @@
--*/
BOOLEAN
+NTAPI
FindDevices(
IN PVOID HwDeviceExtension,
IN ULONG Flags,
Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp [iso-8859-1]
(original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp [iso-8859-1] Mon Apr
6 18:38:21 2009
@@ -4,6 +4,7 @@
Get cost of insertion Req1 before Req2
*/
LONGLONG
+NTAPI
UniataGetCost(
PHW_LU_EXTENSION LunExt,
IN PATA_REQ AtaReq1,
@@ -52,6 +53,7 @@
Perform reorder if necessary
*/
VOID
+NTAPI
UniataQueueRequest(
IN PHW_CHANNEL chan,
IN PSCSI_REQUEST_BLOCK Srb
@@ -218,6 +220,7 @@
Remove request from queue and get next request
*/
VOID
+NTAPI
UniataRemoveRequest(
IN PHW_CHANNEL chan,
IN PSCSI_REQUEST_BLOCK Srb
@@ -306,6 +309,7 @@
(from head of the queue)
*/
PSCSI_REQUEST_BLOCK
+NTAPI
UniataGetCurRequest(
IN PHW_CHANNEL chan
)
@@ -323,6 +327,7 @@
(used in simplex mode only)
*/
PHW_CHANNEL
+NTAPI
UniataGetNextChannel(
IN PHW_CHANNEL chan
)
Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_queue.h?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_queue.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_queue.h [iso-8859-1] Mon Apr 6
18:38:21 2009
@@ -6,6 +6,7 @@
Perform reorder if necessary
*/
VOID
+NTAPI
UniataQueueRequest(
IN PHW_CHANNEL chan,
IN PSCSI_REQUEST_BLOCK Srb
@@ -15,6 +16,7 @@
Remove request from queue and get next request
*/
VOID
+NTAPI
UniataRemoveRequest(
IN PHW_CHANNEL chan,
IN PSCSI_REQUEST_BLOCK Srb
@@ -25,6 +27,7 @@
(from head of the queue)
*/
PSCSI_REQUEST_BLOCK
+NTAPI
UniataGetCurRequest(
IN PHW_CHANNEL chan
);
@@ -34,6 +37,7 @@
(used in simplex mode only)
*/
PHW_CHANNEL
+NTAPI
UniataGetNextChannel(
IN PHW_CHANNEL chan
);
Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Mon Apr
6 18:38:21 2009
@@ -1,6 +1,7 @@
#include "stdafx.h"
UCHAR
+NTAPI
UniataSataConnect(
IN PVOID HwDeviceExtension,
IN ULONG lChannel // logical channel
@@ -61,6 +62,7 @@
} // end UniataSataConnect()
UCHAR
+NTAPI
UniataSataPhyEnable(
IN PVOID HwDeviceExtension,
IN ULONG lChannel // logical channel
@@ -118,6 +120,7 @@
} // end UniataSataPhyEnable()
BOOLEAN
+NTAPI
UniataSataClearErr(
IN PVOID HwDeviceExtension,
IN ULONG lChannel, // logical channel
@@ -162,6 +165,7 @@
} // end UniataSataClearErr()
BOOLEAN
+NTAPI
UniataSataEvent(
IN PVOID HwDeviceExtension,
IN ULONG lChannel, // logical channel
@@ -197,6 +201,7 @@
} // end UniataSataEvent()
BOOLEAN
+NTAPI
UniataAhciInit(
IN PVOID HwDeviceExtension
)
@@ -308,6 +313,7 @@
} // end UniataAhciInit()
UCHAR
+NTAPI
UniataAhciStatus(
IN PVOID HwDeviceExtension,
IN ULONG lChannel
@@ -367,6 +373,7 @@
} // end UniataAhciStatus()
ULONG
+NTAPI
UniataAhciSetupFIS(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG DeviceNumber,
Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_sata.h?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] Mon Apr 6
18:38:21 2009
@@ -2,12 +2,14 @@
#define __UNIATA_SATA__H__
UCHAR
+NTAPI
UniataSataConnect(
IN PVOID HwDeviceExtension,
IN ULONG lChannel // logical channel
);
UCHAR
+NTAPI
UniataSataPhyEnable(
IN PVOID HwDeviceExtension,
IN ULONG lChannel // logical channel
@@ -17,6 +19,7 @@
#define UNIATA_SATA_IGNORE_CONNECT FALSE
BOOLEAN
+NTAPI
UniataSataClearErr(
IN PVOID HwDeviceExtension,
IN ULONG lChannel, // logical channel
@@ -27,6 +30,7 @@
#define UNIATA_SATA_EVENT_DETACH 0x02
BOOLEAN
+NTAPI
UniataSataEvent(
IN PVOID HwDeviceExtension,
IN ULONG lChannel, // logical channel
@@ -39,17 +43,20 @@
(deviceExtension->chan[lChannel].RegTranslation[IDX_SATA_SStatus].Addr))
BOOLEAN
+NTAPI
UniataAhciInit(
IN PVOID HwDeviceExtension
);
UCHAR
+NTAPI
UniataAhciStatus(
IN PVOID HwDeviceExtension,
IN ULONG lChannel
);
ULONG
+NTAPI
UniataAhciSetupFIS(
IN PHW_DEVICE_EXTENSION deviceExtension,
IN ULONG DeviceNumber,
Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h [iso-8859-1]
(original)
+++ trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h [iso-8859-1] Mon Apr
6 18:38:21 2009
@@ -28,6 +28,7 @@
extern "C"
NTSTATUS
+NTAPI
CrNtInit(
IN PDRIVER_OBJECT DriverObject,
IN PUNICODE_STRING RegistryPath
@@ -35,12 +36,14 @@
extern "C"
PVOID
+NTAPI
CrNtGetModuleBase(
IN PCHAR pModuleName
);
extern "C"
PVOID
+NTAPI
CrNtFindModuleBaseByPtr(
IN PVOID ptrInSection,
IN PCHAR ptrExportedName
@@ -48,6 +51,7 @@
extern "C"
PVOID
+NTAPI
CrNtGetProcAddress(
PVOID ModuleBase,
PCHAR pFunctionName
Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1]
(original)
+++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Mon Apr
6 18:38:21 2009
@@ -4,7 +4,6 @@
<bootstrap installbase="$(CDOUTPUT)" />
<include base="uniata">.</include>
<include base="uniata">inc</include>
- <compilerflag>-mrtd</compilerflag>
<!-- define name="_DEBUG" /-->
<library>ntoskrnl</library>
<library>hal</library>
