Modified: trunk/reactos/drivers/dd/green/createclose.c
Modified: trunk/reactos/drivers/dd/green/dispatch.c
Modified: trunk/reactos/drivers/dd/green/green.c
Modified: trunk/reactos/drivers/dd/green/green.h
Modified: trunk/reactos/drivers/dd/green/keyboard.c
Modified: trunk/reactos/drivers/dd/green/misc.c
Modified: trunk/reactos/drivers/dd/green/pnp.c
Modified: trunk/reactos/drivers/dd/green/screen.c
--- trunk/reactos/drivers/dd/green/createclose.c 2005-10-28 07:04:05 UTC (rev 18825)
+++ trunk/reactos/drivers/dd/green/createclose.c 2005-10-28 07:49:16 UTC (rev 18826)
@@ -1,17 +1,18 @@
-/* $Id:
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VT100 emulator
* FILE: drivers/dd/green/createclose.c
* PURPOSE: IRP_MJ_CREATE, IRP_MJ_CLOSE and IRP_MJ_CLEANUP operations
*
- * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.org)
*/
//#define NDEBUG
+#include <debug.h>
+
#include "green.h"
-NTSTATUS STDCALL
+NTSTATUS NTAPI
GreenCreate(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
@@ -24,7 +25,7 @@
return STATUS_SUCCESS;
}
-NTSTATUS STDCALL
+NTSTATUS NTAPI
GreenClose(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
--- trunk/reactos/drivers/dd/green/dispatch.c 2005-10-28 07:04:05 UTC (rev 18825)
+++ trunk/reactos/drivers/dd/green/dispatch.c 2005-10-28 07:49:16 UTC (rev 18826)
@@ -1,17 +1,18 @@
-/* $Id:
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VT100 emulator
* FILE: drivers/dd/green/dispatch.c
* PURPOSE: Dispatch routines
*
- * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.org)
*/
#define NDEBUG
+#include <debug.h>
+
#include "green.h"
-NTSTATUS STDCALL
+NTSTATUS NTAPI
GreenDispatch(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
--- trunk/reactos/drivers/dd/green/green.c 2005-10-28 07:04:05 UTC (rev 18825)
+++ trunk/reactos/drivers/dd/green/green.c 2005-10-28 07:49:16 UTC (rev 18826)
@@ -1,17 +1,18 @@
-/* $Id:
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VT100 emulator
* FILE: drivers/dd/green/green.c
* PURPOSE: Driver entry point
*
- * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.org)
*/
//#define NDEBUG
+#include <debug.h>
+
#include "green.h"
-VOID STDCALL
+VOID NTAPI
DriverUnload(IN PDRIVER_OBJECT DriverObject)
{
// nothing to do here yet
@@ -20,7 +21,7 @@
/*
* Standard DriverEntry method.
*/
-NTSTATUS STDCALL
+NTSTATUS NTAPI
DriverEntry(
IN PDRIVER_OBJECT DriverObject,
IN PUNICODE_STRING RegPath)
--- trunk/reactos/drivers/dd/green/green.h 2005-10-28 07:04:05 UTC (rev 18825)
+++ trunk/reactos/drivers/dd/green/green.h 2005-10-28 07:49:16 UTC (rev 18826)
@@ -1,24 +1,15 @@
+#include <ntddk.h>
+#include <ntddser.h>
+#include <kbdmou.h>
+#include <stdarg.h>
+
#if defined(__GNUC__)
- #include <ddk/ntddk.h>
- #include <ddk/ntddser.h>
#include <wincon.h>
#include <drivers/blue/ntddblue.h>
- #include <ddk/ntddkbd.h> /* should be in kbdmou.h */
- #include <winbase.h>
- #include <debug.h>
+ #define INFINITE 0xFFFFFFFF
- /* FIXME: should be in kbdmou.h */
- typedef struct _CONNECT_DATA {
- PDEVICE_OBJECT ClassDeviceObject;
- PVOID ClassService;
- } CONNECT_DATA, *PCONNECT_DATA;
-
- /* FIXME: should be in kbdmou.h */
- #define IOCTL_INTERNAL_KEYBOARD_CONNECT \
- CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS)
-
- NTSTATUS STDCALL
+ NTSTATUS NTAPI
ObReferenceObjectByName(PUNICODE_STRING ObjectPath,
ULONG Attributes,
PACCESS_STATE PassedAccessState,
@@ -28,9 +19,6 @@
PVOID ParseContext,
PVOID* ObjectPtr);
- /* FIXME: should be in kbdmou.h */
- typedef VOID (*PSERVICE_CALLBACK_ROUTINE)(PDEVICE_OBJECT, PKEYBOARD_INPUT_DATA, PKEYBOARD_INPUT_DATA, PULONG);
-
typedef struct _CLASS_INFORMATION
{
PDEVICE_OBJECT DeviceObject;
@@ -40,16 +28,7 @@
#define KEYBOARD_BUFFER_SIZE 100
#elif defined(_MSC_VER)
- #include <ntddk.h>
- #include <ntddser.h>
- #include <kbdmou.h>
-
- #define STDCALL
-
- #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint
- #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__)
- #define DPRINT DPRINT1
- #define CHECKPOINT CHECKPOINT1
+ /* Nothing more to do */
#else
#error Unknown compiler!
#endif
--- trunk/reactos/drivers/dd/green/keyboard.c 2005-10-28 07:04:05 UTC (rev 18825)
+++ trunk/reactos/drivers/dd/green/keyboard.c 2005-10-28 07:49:16 UTC (rev 18826)
@@ -1,14 +1,15 @@
-/* $Id:
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VT100 emulator
* FILE: drivers/dd/green/keyboard.c
* PURPOSE: Keyboard part of green management
*
- * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.org)
*/
#define NDEBUG
+#include <debug.h>
+
#include "green.h"
static BOOLEAN
@@ -138,7 +139,7 @@
return STATUS_SUCCESS;
}
-static VOID STDCALL
+static VOID NTAPI
KeyboardDpcSendData(
IN PKDPC Dpc,
IN PVOID pDeviceExtension, /* real type PKEYBOARD_DEVICE_EXTENSION */
@@ -161,7 +162,7 @@
DeviceExtension->InputDataCount[Queue] = 0;
}
-static VOID STDCALL
+static VOID NTAPI
KeyboardDeviceWorker(
PVOID Context)
{
--- trunk/reactos/drivers/dd/green/misc.c 2005-10-28 07:04:05 UTC (rev 18825)
+++ trunk/reactos/drivers/dd/green/misc.c 2005-10-28 07:49:16 UTC (rev 18826)
@@ -1,14 +1,15 @@
-/* $Id:
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VT100 emulator
* FILE: drivers/dd/green/misc.c
* PURPOSE: Misceallenous operations
*
- * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.org)
*/
//#define NDEBUG
+#include <debug.h>
+
#include "green.h"
NTSTATUS
--- trunk/reactos/drivers/dd/green/pnp.c 2005-10-28 07:04:05 UTC (rev 18825)
+++ trunk/reactos/drivers/dd/green/pnp.c 2005-10-28 07:49:16 UTC (rev 18826)
@@ -1,17 +1,18 @@
-/* $Id:
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VT100 emulator
* FILE: drivers/dd/green/pnp.c
* PURPOSE: IRP_MJ_PNP operations
*
- * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS: HervÚ Poussineau (hpoussin@reactos.org)
*/
#define NDEBUG
+#include <debug.h>
+
#include "green.h"
-NTSTATUS STDCALL
+NTSTATUS NTAPI
GreenAddDevice(
IN PDRIVER_OBJECT DriverObject,
IN PDEVICE_OBJECT Pdo)
--- trunk/reactos/drivers/dd/green/screen.c 2005-10-28 07:04:05 UTC (rev 18825)
+++ trunk/reactos/drivers/dd/green/screen.c 2005-10-28 07:49:16 UTC (rev 18826)
@@ -1,5 +1,4 @@
-/* $Id:
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VT100 emulator
* FILE: drivers/dd/green/screen.c
@@ -7,12 +6,13 @@
*
* PROGRAMMERS: Eric Kohl (ekohl@abo.rhein-zeitung.de)
* Art Yerkes
- * HervÚ Poussineau (hpoussin@reactos.com)
+ * HervÚ Poussineau (hpoussin@reactos.org)
*/
#define NDEBUG
+#include <debug.h>
+
#include "green.h"
-#include <stdarg.h>
#define ESC ((UCHAR)0x1b)