Ros-diffs

ros-diffs@reactos.org

81390 discussions

[silverblade] 27485: Renamed legacy mpu401 driver to mpu401_nt4 and disabled the building of all drivers in this directory (all are incomplete, none of them work and are superceded by the Kernel Streaming alternatives.) Leaving drivers in source tree for reference at present but they can eventually be removed.
by silverblade＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: silverblade Date: Sun Jul 8 20:07:01 2007 New Revision: 27485 URL: http://svn.reactos.org/svn/reactos?rev=27485&view=rev Log: Renamed legacy mpu401 driver to mpu401_nt4 and disabled the building of all drivers in this directory (all are incomplete, none of them work and are superceded by the Kernel Streaming alternatives.) Leaving drivers in source tree for reference at present but they can eventually be removed. Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc trunk/reactos/drivers/multimedia/audio/mpu401_nt4/portio.c trunk/reactos/drivers/multimedia/audio/mpu401_nt4/readme.txt trunk/reactos/drivers/multimedia/audio/mpu401_nt4/sbdebug.h trunk/reactos/drivers/multimedia/audio/mpu401_nt4/settings.c trunk/reactos/drivers/multimedia/audio/mpu401_nt4/test.c Removed: trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.c trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.h trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.rbuild trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.rc trunk/reactos/drivers/multimedia/audio/mpu401/portio.c trunk/reactos/drivers/multimedia/audio/mpu401/readme.txt trunk/reactos/drivers/multimedia/audio/mpu401/sbdebug.h trunk/reactos/drivers/multimedia/audio/mpu401/settings.c trunk/reactos/drivers/multimedia/audio/mpu401/test.c Modified: trunk/reactos/drivers/multimedia/audio/directory.rbuild Modified: trunk/reactos/drivers/multimedia/audio/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/d… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/directory.rbuild (original) +++ trunk/reactos/drivers/multimedia/audio/directory.rbuild Sun Jul 8 20:07:01 2007 @@ -1,5 +1,9 @@ -<directory name="mpu401"> - <xi:include href="mpu401/mpu401.rbuild" /> + Removed: trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.c (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.c (removed) @@ -1,408 +1,0 @@ -/* - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/dd/mpu401/mpu401.c - * PURPOSE: MPU-401 MIDI device driver - * PROGRAMMER: Andrew Greenwood - * UPDATE HISTORY: - * Sept 26, 2003: Copied from beep.c as template - * Sept 27, 2003: Implemented MPU-401 init & playback - */ - -/* INCLUDES ****************************************************************/ - -#include <ntddk.h> -//#include <ntddbeep.h> - -//#define NDEBUG -#include <debug.h> - -#include "mpu401.h" - - -/* INTERNAL VARIABLES ******************************************************/ - -ULONG DeviceCount = 0; - - -/* FUNCTIONS ***************************************************************/ - -static NTSTATUS InitDevice( - IN PUNICODE_STRING RegistryPath, - IN PVOID Context) -{ -// PDEVICE_INSTANCE Instance = Context; - PDEVICE_OBJECT DeviceObject; // = Context; - PDEVICE_EXTENSION Parameters; // = DeviceObject->DeviceExtension; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\MidiOut0"); - UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\MidiOut0"); -// CONFIG Config; - RTL_QUERY_REGISTRY_TABLE Table[2]; - NTSTATUS s; - - // This is TEMPORARY, to ensure that we don't process more than 1 device. - // I'll remove this limitation in the future. - if (DeviceCount > 0) - { - DPRINT("Sorry - only 1 device supported by MPU401 driver at present :(\n"); - return STATUS_NOT_IMPLEMENTED; - } - - DPRINT("Creating IO device\n"); - - s = IoCreateDevice(Context, // driverobject - sizeof(DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_SOUND, // Correct? - 0, - FALSE, - &DeviceObject); - - if (!NT_SUCCESS(s)) - return s; - - DPRINT("Device Extension at 0x%x\n", DeviceObject->DeviceExtension); - Parameters = DeviceObject->DeviceExtension; - - DPRINT("Creating DOS link\n"); - - /* Create the dos device link */ - IoCreateSymbolicLink(&SymlinkName, - &DeviceName); - - DPRINT("Initializing device\n"); - -// DPRINT("Allocating memory for parameters structure\n"); - // Bodged: -// Parameters = (PDEVICE_EXTENSION)ExAllocatePool(NonPagedPool, sizeof(DEVICE_EXTENSION)); -// DeviceObject->DeviceExtension = Parameters; -// Parameters = Instance->DriverObject->DriverExtension; - - DPRINT("DeviceObject at 0x%x, DeviceExtension at 0x%x\n", DeviceObject, Parameters); - - if (! Parameters) - { - DPRINT("NULL POINTER!\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - -// Instance->DriverObject->DriverExtension = Parameters; - - DPRINT("Setting reg path\n"); - Parameters->RegistryPath = RegistryPath; -// Parameters->DriverObject = Instance->DriverObject; - - DPRINT("Zeroing table memory and setting query routine\n"); - RtlZeroMemory(Table, sizeof(Table)); - Table[0].QueryRoutine = LoadSettings; - - DPRINT("Setting port and IRQ defaults\n"); - Parameters->Port = DEFAULT_PORT; - Parameters->IRQ = DEFAULT_IRQ; - -// Only to be enabled once we can get support for multiple cards working :) -/* - DPRINT("Loading settings from: %S\n", RegistryPath); - - s = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, RegistryPath, Table, - &Parameters, NULL); -*/ - - if (! NT_SUCCESS(s)) - return s; - - DPRINT("Port 0x%x IRQ %d\n", Parameters->Port, Parameters->IRQ); - -// Instance->P - - // Enter UART mode (should be done in init phase - if (! InitUARTMode(Parameters->Port)) - { - DPRINT("UART mode initialization FAILED!\n"); - // Set state indication somehow - // Failure - what error code do we give?! - // return STATUS_???? - } - - DeviceCount ++; - - return STATUS_SUCCESS; -} - - -static NTSTATUS STDCALL -MPU401Create(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -/* - * FUNCTION: Handles user mode requests - * ARGUMENTS: - * DeviceObject = Device for request - * Irp = I/O request packet describing request - * RETURNS: Success or failure - */ -{ - DPRINT("MPU401Create() called!\n"); - - // Initialize the MPU-401? - // ... do stuff ... - - - // Play a note to say we're alive: - WaitToSend(MPU401_PORT); - MPU401_WRITE_DATA(MPU401_PORT, 0x90); - WaitToSend(MPU401_PORT); - MPU401_WRITE_DATA(MPU401_PORT, 0x50); - WaitToSend(MPU401_PORT); - MPU401_WRITE_DATA(MPU401_PORT, 0x7f); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return(STATUS_SUCCESS); -} - - -static NTSTATUS STDCALL -MPU401Close(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -/* - * FUNCTION: Handles user mode requests - * ARGUMENTS: - * DeviceObject = Device for request - * Irp = I/O request packet describing request - * RETURNS: Success or failure - */ -{ - PDEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; - - DPRINT("MPU401Close() called!\n"); - - DeviceExtension = DeviceObject->DeviceExtension; - - Status = STATUS_SUCCESS; - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return(Status); -} - - -static NTSTATUS STDCALL -MPU401Cleanup(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -/* - * FUNCTION: Handles user mode requests - * ARGUMENTS: - * DeviceObject = Device for request - * Irp = I/O request packet describing request - * RETURNS: Success or failure - */ -{ - ULONG Channel; - DPRINT("MPU401Cleanup() called!\n"); - - // Reset the device (should we do this?) - for (Channel = 0; Channel <= 15; Channel ++) - { - // All notes off -// MPU401_WRITE_MESSAGE(MPU401_PORT, 0xb0 + Channel, 123, 0); - // All controllers off -// MPU401_WRITE_MESSAGE(MPU401_PORT, 0xb0 + Channel, 121, 0); - } - - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return(STATUS_SUCCESS); -} - - -static NTSTATUS STDCALL -MPU401DeviceControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -/* - * FUNCTION: Handles user mode requests - * ARGUMENTS: - * DeviceObject = Device for request - * Irp = I/O request packet describing request - * RETURNS: Success or failure - */ -{ - PIO_STACK_LOCATION Stack; - PDEVICE_EXTENSION DeviceExtension; - ULONG ByteCount; - PUCHAR Data; - - DPRINT("MPU401DeviceControl() called!\n"); - - DeviceExtension = DeviceObject->DeviceExtension; - Stack = IoGetCurrentIrpStackLocation(Irp); - - DPRINT("Control code %d [0x%x]\n", Stack->Parameters.DeviceIoControl.IoControlCode, - Stack->Parameters.DeviceIoControl.IoControlCode); - - switch(Stack->Parameters.DeviceIoControl.IoControlCode) - { - case IOCTL_MIDI_PLAY : - { - DPRINT("Received IOCTL_MIDI_PLAY\n"); - Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; - - DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); - - for (ByteCount = 0; ByteCount < Stack->Parameters.DeviceIoControl.InputBufferLength; ByteCount ++) - { - DPRINT("0x%x ", Data[ByteCount]); - - MPU401_WRITE_BYTE(DeviceExtension->Port, Data[ByteCount]); -// if (WaitToSend(MPU401_PORT)) -// MPU401_WRITE_DATA(MPU401_PORT, Data[ByteCount]); - } - - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return(STATUS_SUCCESS); - } - } - - return(STATUS_SUCCESS); - -/* - DeviceExtension = DeviceObject->DeviceExtension; - Stack = IoGetCurrentIrpStackLocation(Irp); - BeepParam = (PBEEP_SET_PARAMETERS)Irp->AssociatedIrp.SystemBuffer; - - Irp->IoStatus.Information = 0; - - if (Stack->Parameters.DeviceIoControl.IoControlCode != IOCTL_BEEP_SET) - { - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - return(STATUS_NOT_IMPLEMENTED); - } - - if ((Stack->Parameters.DeviceIoControl.InputBufferLength != sizeof(BEEP_SET_PARAMETERS)) - || (BeepParam->Frequency < BEEP_FREQUENCY_MINIMUM) - || (BeepParam->Frequency > BEEP_FREQUENCY_MAXIMUM)) - { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - return(STATUS_INVALID_PARAMETER); - } - - DueTime.QuadPart = 0; -*/ - /* do the beep!! */ -/* DPRINT("Beep:\n Freq: %lu Hz\n Dur: %lu ms\n", - pbsp->Frequency, - pbsp->Duration); - - if (BeepParam->Duration >= 0) - { - DueTime.QuadPart = (LONGLONG)BeepParam->Duration * -10000; - - KeSetTimer(&DeviceExtension->Timer, - DueTime, - &DeviceExtension->Dpc); - - HalMakeBeep(BeepParam->Frequency); - DeviceExtension->BeepOn = TRUE; - KeWaitForSingleObject(&DeviceExtension->Event, - Executive, - KernelMode, - FALSE, - NULL); - } - else if (BeepParam->Duration == (DWORD)-1) - { - if (DeviceExtension->BeepOn == TRUE) - { - HalMakeBeep(0); - DeviceExtension->BeepOn = FALSE; - } - else - { - HalMakeBeep(BeepParam->Frequency); - DeviceExtension->BeepOn = TRUE; - } - } - - DPRINT("Did the beep!\n"); - - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - return(STATUS_SUCCESS); -*/ -} - - -static VOID STDCALL -MPU401Unload(PDRIVER_OBJECT DriverObject) -{ - DPRINT("MPU401Unload() called!\n"); -} - - -NTSTATUS STDCALL -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) -/* - * FUNCTION: Called by the system to initalize the driver - * ARGUMENTS: - * DriverObject = object describing this driver - * RegistryPath = path to our configuration entries - * RETURNS: Success or failure - */ -{ -// PDEVICE_EXTENSION DeviceExtension; -// PDEVICE_OBJECT DeviceObject; -// DEVICE_INSTANCE Instance; - // Doesn't support multiple instances (yet ...) - NTSTATUS Status; - - DPRINT("MPU401 Device Driver 0.0.1\n"); - - // Is this really necessary? Yes! (Talking to myself again...) -// Instance.DriverObject = DriverObject; - // previous instance = NULL... - -// DeviceExtension->RegistryPath = RegistryPath; - - DriverObject->Flags = 0; - DriverObject->MajorFunction[IRP_MJ_CREATE] = MPU401Create; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = MPU401Close; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = MPU401Cleanup; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = MPU401DeviceControl; - DriverObject->DriverUnload = MPU401Unload; - - // Major hack to just get this damn thing working: - Status = InitDevice(RegistryPath, DriverObject); // ???? - -// DPRINT("Enumerating devices at %wZ\n", RegistryPath); - -// Status = EnumDeviceKeys(RegistryPath, PARMS_SUBKEY, InitDevice, (PVOID)&DeviceObject); // &Instance; - - // check error - - /* set up device extension */ -// DeviceExtension = DeviceObject->DeviceExtension; -// DeviceExtension->BeepOn = FALSE; - - return(STATUS_SUCCESS); -} - -/* EOF */ Removed: trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.h (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.h (removed) @@ -1,155 +1,0 @@ -/* - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/dd/mpu401/mpu401.h - * PURPOSE: MPU-401 MIDI device driver header - * PROGRAMMER: Andrew Greenwood - * UPDATE HISTORY: - * Sept 26, 2003: Created - */ - -#ifndef __INCLUDES_MPU401_H__ -#define __INCLUDES_MPU401_H__ - -//#include <mmsystem.h> -//#include <mmddk.h> -//#include <winioctl.h> -#include "../../../dll/win32/mmdrv/mmdef.h" - -#define DEFAULT_PORT 0x330 -#define DEFAULT_IRQ 9 - -#define DEVICE_SUBKEY L"Devices" -#define PARMS_SUBKEY L"Parameters" - -#define REGISTRY_PORT L"Port" - -// At the moment, we just support a single device with fixed parameters: -#define MPU401_PORT DEFAULT_PORT -#define MPU401_IRQ DEFAULT_IRQ - -#define MPU401_TIMEOUT 10000 - -/* OBSOLETE - see mmdef.h instead: -#define IOCTL_SOUND_BASE FILE_DEVICE_SOUND -// wave base 0 -#define IOCTL_MIDI_BASE 0x0080 - -#define IOCTL_MIDI_GET_CAPABILITIES CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_MIDI_SET_STATE CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0002, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_MIDI_GET_STATE CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0003, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_MIDI_SET_VOLUME CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_MIDI_GET_VOLUME CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_MIDI_PLAY CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0006, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_MIDI_RECORD CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0007, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_MIDI_CACHE_PATCHES CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0008, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_MIDI_CACHE_DRUM_PATCHES CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0009, METHOD_BUFFERED, FILE_WRITE_ACCESS) -*/ - -// The MPU-401 has 2 ports, usually 0x330 and 0x331, which are known as -// "data" and "status/command", respectively. These macros deal with -// reading from and writing to these ports: - -#define MPU401_WRITE_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp, x) -#define MPU401_READ_DATA(bp) READ_PORT_UCHAR((PUCHAR) bp) -#define MPU401_WRITE_COMMAND(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+1, x) -#define MPU401_READ_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp+1) - - -// Flow control - -#define MPU401_READY_TO_SEND(bp) \ - MPU401_READ_STATUS(bp) & 0x80 - -#define MPU401_READY_TO_RECEIVE(bp) \ - MPU401_READ_STATUS(bp) & 0x40 - - -#define MPU401_WRITE_BYTE(bp, x) \ - if (WaitToSend(bp)) MPU401_WRITE_DATA(bp, x) - -#define MPU401_WRITE_MESSAGE(bp, status, da, db) \ - MPU401_WRITE(bp, status); \ - MPU401_WRITE(bp, da); \ - MPU401_WRITE(bp, db) - -//#define MPU401_READ(bp) -// if (WaitToRead(bp)) ... ??? - -/* - DEVICE_EXTENSION contains the settings for each individual device -*/ - -typedef struct _DEVICE_EXTENSION -{ - PUNICODE_STRING RegistryPath; - PDRIVER_OBJECT DriverObject; - ULONG Port; - ULONG IRQ; -// KDPC Dpc; -// KTIMER Timer; -// KEVENT Event; -// BOOLEAN BeepOn; -} DEVICE_EXTENSION, *PDEVICE_EXTENSION; - -/* - DEVICE_INSTANCE contains ??? -*/ - -typedef struct _DEVICE_INSTANCE -{ - // pPrevGDI - PDRIVER_OBJECT DriverObject; -} DEVICE_INSTANCE, *PDEVICE_INSTANCE; - -/* - CONFIG contains device parameters (port/IRQ) - THIS STRUCTURE IS REDUNDANT -*/ - -//typedef struct _CONFIG -//{ -// ULONG Port; -// ULONG IRQ; -//} CONFIG, *PCONFIG; - -/* - Some callback typedefs -*/ - -typedef NTSTATUS REGISTRY_CALLBACK_ROUTINE(PWSTR RegistryPath, PVOID Context); -typedef REGISTRY_CALLBACK_ROUTINE *PREGISTRY_CALLBACK_ROUTINE; - - -/* - Prototypes for functions in portio.c : -*/ - -BOOLEAN WaitToSend(ULONG BasePort); -BOOLEAN WaitToReceive(ULONG BasePort); -BOOLEAN InitUARTMode(ULONG BasePort); - -/* - Prototypes for functions in settings.c : -*/ - -NTSTATUS STDCALL EnumDeviceKeys( - IN PUNICODE_STRING RegistryPath, - IN PWSTR SubKey, - IN PREGISTRY_CALLBACK_ROUTINE Callback, - IN PVOID Context); - -NTSTATUS STDCALL LoadSettings( - IN PWSTR ValueName, - IN ULONG ValueType, - IN PVOID ValueData, - IN ULONG ValueLength, - IN PVOID Context, - IN PVOID EntryContext); - -NTSTATUS STDCALL -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); - -#endif Removed: trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.rbuild (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.rbuild (removed) @@ -1,10 +1,0 @@ -<module name="mpu401" type="kernelmodedriver"> - <include base="mpu401">.</include> - <define name="__USE_W32API" /> - <library>ntoskrnl</library> - <library>hal</library> - <file>mpu401.c</file> - <file>portio.c</file> - <file>settings.c</file> - <file>mpu401.rc</file> -</module> Removed: trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.rc (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401/mpu401.rc (removed) @@ -1,7 +1,0 @@ -/* $Id$ */ - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "MPU-401 MIDI Driver\0" -#define REACTOS_STR_INTERNAL_NAME "mpu401\0" -#define REACTOS_STR_ORIGINAL_FILENAME "mpu401.sys\0" -#include <reactos/version.rc> Removed: trunk/reactos/drivers/multimedia/audio/mpu401/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401/portio.c (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401/portio.c (removed) @@ -1,96 +1,0 @@ -/* - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/dd/mpu401/portio.c (see also mpu401.h) - * PURPOSE: MPU-401 MIDI port I/O helper - * PROGRAMMER: Andrew Greenwood - * UPDATE HISTORY: - * Sept 26, 2003: Created - */ - -#include <ntddk.h> -#include "mpu401.h" - - -BOOLEAN WaitToSend(ULONG BasePort) -{ - int TimeOut; - - DbgPrint("WaitToSend "); - - // Check if it's OK to send - for (TimeOut = MPU401_TIMEOUT; - ! MPU401_READY_TO_SEND(BasePort) && TimeOut > 0; - TimeOut --); - - // If a time-out occurs, we report failure - if (! TimeOut) - { - DbgPrint("FAILED\n"); - return FALSE; - } - - DbgPrint("SUCCEEDED\n"); - - return TRUE; -} - - -BOOLEAN WaitToReceive(ULONG BasePort) -{ - int TimeOut; - - DbgPrint("WaitToSend "); - - // Check if it's OK to receive - for (TimeOut = MPU401_TIMEOUT; - ! MPU401_READY_TO_RECEIVE(BasePort) && TimeOut > 0; - TimeOut --); - - // If a time-out occurs, we report failure - if (! TimeOut) - { - DbgPrint("FAILED\n"); - return FALSE; - } - - DbgPrint("SUCCEEDED\n"); - - return TRUE; -} - - -BOOLEAN InitUARTMode(ULONG BasePort) -{ - ULONG TimeOut; - UCHAR Status = 0; - - DbgPrint("InitUARTMode() called\n"); - - // Check if it's OK to send - if (! WaitToSend(BasePort)) - return FALSE; - - DbgPrint("Resetting MPU401\n"); - - // Send an MPU reset: - MPU401_WRITE_COMMAND(BasePort, 0xff); - - // Check if it's OK to receive (some cards will ignore the above reset - // command and so will not issue an ACK, so time out is NOT an error) - DbgPrint("Waiting for an ACK\n"); - if (WaitToReceive(BasePort)) - { - // Check to make sure the reset was acknowledged: - for (TimeOut = MPU401_TIMEOUT; - (Status = (MPU401_READ_DATA(BasePort) & 0xfe) && TimeOut > 0); - TimeOut --); - } - - DbgPrint("Entering UART mode\n"); - // Now we kick the MPU401 into UART ("dumb") mode - MPU401_WRITE_COMMAND(BasePort, 0x3f); - - return TRUE; -} Removed: trunk/reactos/drivers/multimedia/audio/mpu401/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401/readme.txt (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401/readme.txt (removed) @@ -1,28 +1,0 @@ ----------------------------------- -REACTOS MPU-401 MIDI DEVICE DRIVER -by Andrew Greenwood ----------------------------------- - -This driver initializes the MPU-401 MIDI/joystick port found on -most sound cards, and allows the sending of simple messages. - -It's far from complete, and at present will only support 1 device. - -In Bochs, the MIDI output will be played using whatever device is -set up in Windows as your MIDI output. - -For real hardware, the output will be played to whatever device is -attached to your MIDI/joystick port, or, in some cases, the wave-table -or other synth on-board your card (note: this is NOT an FM synth -driver!) - - -Thanks to Vizzini and all the other great ReactOS developers for -helping me code this driver and also for giving me encouragement. - -I'd also like to thank Jeff Glatt, whose MIDI and MPU-401 -documentation has been a valuable resource to me over the past few -years, and who provided me with almost all of my knowledge of MIDI -and MPU-401. His site is at: www.borg.com/~jglatt/ - -- Andrew "Silver Blade" Greenwood Removed: trunk/reactos/drivers/multimedia/audio/mpu401/sbdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401/sbdebug.h (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401/sbdebug.h (removed) @@ -1,24 +1,0 @@ -#ifndef NDEBUG -#define TEST_STATUS(s) \ - if (! NT_SUCCESS(s)) \ - { \ - if (s == STATUS_NO_MORE_ENTRIES) \ - DPRINT("NTSTATUS == NO MORE ENTRIES\n") \ - else if (s == STATUS_BUFFER_OVERFLOW) \ - DPRINT("NTSTATUS == BUFFER OVERFLOW\n") \ - else if (s == STATUS_BUFFER_TOO_SMALL) \ - DPRINT("NTSTATUS == BUFFER TOO SMALL\n") \ - else if (s == STATUS_INVALID_PARAMETER) \ - DPRINT("NTSTATUS == INVALID PARAMETER\n") \ - else if (s == STATUS_OBJECT_NAME_NOT_FOUND) \ - DPRINT("NTSTATUS == OBJECT NAME NOT FOUND\n") \ - else if (s == STATUS_INVALID_HANDLE) \ - DPRINT("NTATATUS == INVALID_HANDLE\n") \ - else if (s == STATUS_ACCESS_DENIED) \ - DPRINT("NTSTATUS == ACCESS_DENIED\n") \ - else \ - DPRINT("NTSTATUS == FAILURE (?)\n"); \ - } -#else -#define TEST_STATUS(s) -#endif Removed: trunk/reactos/drivers/multimedia/audio/mpu401/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401/settings.c (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401/settings.c (removed) @@ -1,307 +1,0 @@ -/* - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/dd/mpu401/settings.c - * PURPOSE: MPU-401 MIDI device driver setting management - * PROGRAMMER: Andrew Greenwood - * UPDATE HISTORY: - * Sept 27, 2003: Created - */ - -#include <ntddk.h> - -#include "mpu401.h" - -#define NDEBUG -#include <debug.h> -#include "sbdebug.h" // our own debug helper - -#if 0 -static NTSTATUS -OpenDevicesKey( - IN PWSTR RegistryPath, - OUT PHANDLE Key) -/* - Description: - Create a volatile key under this driver's Services node to contain - the device name list. - - Parameters: - RegistryPath The location of the registry entry - Key The key in the registry - - Return Value: - NT status STATUS_SUCCESS if successful (duh...) -*/ -{ - NTSTATUS s; - HANDLE hKey; - OBJECT_ATTRIBUTES oa; - UNICODE_STRING uStr; - - // Attempt to open the key - - RtlInitUnicodeString(&uStr, RegistryPath); - - InitializeObjectAttributes(&oa, &uStr, OBJ_CASE_INSENSITIVE, NULL, - (PSECURITY_DESCRIPTOR)NULL); - - s = ZwOpenKey(&hKey, KEY_CREATE_SUB_KEY, &oa); - - if (! NT_SUCCESS(s)) - return s; // Problem - - - // Now create sub key - - RtlInitUnicodeString(&uStr, (PWSTR) DEVICE_SUBKEY); - - InitializeObjectAttributes(&oa, &uStr, OBJ_CASE_INSENSITIVE, hKey, - (PSECURITY_DESCRIPTOR)NULL); - - s = ZwCreateKey(Key, KEY_ALL_ACCESS, &oa, 0, NULL, REG_OPTION_VOLATILE, - NULL); - - ZwClose(hKey); - - return s; -} -#endif - - -NTSTATUS STDCALL EnumDeviceKeys( - IN PUNICODE_STRING RegistryPath, - IN PWSTR SubKey, - IN PREGISTRY_CALLBACK_ROUTINE Callback, - IN PVOID Context) -/* - Description: - Enumerate the device subkeys in the driver's registry entry, and - call the specified callback routine for each device. - - Parameters: - RegistryPath The location of the registry entry - Subkey The device's subkey - Callback A routine called for each device - Context ??? - - Return Value: - NT status STATUS_SUCCESS if successful -*/ -{ - NTSTATUS s; - OBJECT_ATTRIBUTES oa; - HANDLE hKey, hSubKey; - UNICODE_STRING SubkeyName; - ULONG i; - - // Attempt to open the key - - InitializeObjectAttributes(&oa, RegistryPath, OBJ_CASE_INSENSITIVE, - NULL, (PSECURITY_DESCRIPTOR)NULL); - - s = ZwOpenKey(&hKey, KEY_READ, &oa); - - TEST_STATUS(s); // debugging - - if (! NT_SUCCESS(s)) - return s; // Problem - - RtlInitUnicodeString(&SubkeyName, SubKey); - - DPRINT("Subkey: %wZ\n", &SubkeyName); - - InitializeObjectAttributes(&oa, &SubkeyName, OBJ_CASE_INSENSITIVE, - hKey, (PSECURITY_DESCRIPTOR)NULL); - - s = ZwOpenKey(&hSubKey, KEY_ENUMERATE_SUB_KEYS, &oa); - - ZwClose(hKey); - - TEST_STATUS(s); // debugging - - if (! NT_SUCCESS(s)) - return s; - - - // And now, the enumeration - - for (i = 0;; i ++) - { - KEY_BASIC_INFORMATION Info; - PKEY_BASIC_INFORMATION pInfo; - ULONG ResultLength = 0; - ULONG Size = 0; - PWSTR Pos; - PWSTR Name; - - // Find the length of the subkey data - -// Info.NameLength = 0; // TEMPORARY! - - s = ZwEnumerateKey(hSubKey, i, KeyBasicInformation, &Info, - sizeof(Info), &ResultLength); - - if (s == STATUS_NO_MORE_ENTRIES) - break; - - DPRINT("Found an entry, allocating memory...\n"); - -// Size = Info.NameLength + FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]); - Size = ResultLength + FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]); - - DPRINT("Size is %d\n", Size); - - pInfo = (PKEY_BASIC_INFORMATION) ExAllocatePool(PagedPool, Size); - - if (pInfo == NULL) - { - DPRINT("INSUFFICIENT RESOURCES!\n"); - s = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - DPRINT("Re-enumerating...\n"); - - s = ZwEnumerateKey(hSubKey, i, KeyBasicInformation, pInfo, Size, - &ResultLength); - -// TEST_STATUS(s); // debugging - - if (! NT_SUCCESS(s)) - { - ExFreePool((PVOID) pInfo); - s = STATUS_INTERNAL_ERROR; - break; - } - - DPRINT("Allocating memory for name...\n"); - - Name = ExAllocatePool(PagedPool, - RegistryPath->Length + sizeof(WCHAR) + - SubkeyName.Length + sizeof(WCHAR) + - pInfo->NameLength + sizeof(UNICODE_NULL)); - - if (Name == NULL) - { - DPRINT("INSUFFICIENT RESOURCES!"); - ExFreePool((PVOID) pInfo); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // Copy the key name - RtlCopyMemory((PVOID)Name, (PVOID)RegistryPath->Buffer, RegistryPath->Length); - Pos = Name + (RegistryPath->Length / sizeof(WCHAR)); - Pos[0] = '\\'; - Pos++; - - // Copy the parameters sub key name - RtlCopyMemory((PVOID)Pos, (PVOID)SubKey, SubkeyName.Length); //SubkeyName? - Pos += SubkeyName.Length / sizeof(WCHAR); - Pos[0] = '\\'; - Pos ++; - - // Copy the device sub key name - RtlCopyMemory((PVOID)Pos, (PVOID)pInfo->Name, pInfo->NameLength); - Pos += pInfo->NameLength / sizeof(WCHAR); - Pos[0] = UNICODE_NULL; - - ExFreePool((PVOID)pInfo); - - DPRINT("Calling callback...\n"); - - s = (*Callback)(Name, Context); - - if (! NT_SUCCESS(s)) - { DPRINT("Callback FAILED\n"); - break;} - } - - ZwClose(hSubKey); - - DPRINT("%d device registry keys found\n", i); - - if ((i == 0) && (s == STATUS_NO_MORE_ENTRIES)) - return STATUS_DEVICE_CONFIGURATION_ERROR; - - return s == STATUS_NO_MORE_ENTRIES ? STATUS_SUCCESS : s; -} - - - -NTSTATUS STDCALL LoadSettings( - IN PWSTR ValueName, - IN ULONG ValueType, - IN PVOID ValueData, - IN ULONG ValueLength, - IN PVOID Context, - IN PVOID EntryContext) -/* - Description: - Read the settings for a particular device - - Parameters: - ValueName The value to read from the registry - ValueType ? - ValueData ? - ValueLength ? - Context The configuration structure to write to - EntryContext ? - - Return Value: - NT status STATUS_SUCCESS if successful -*/ -{ - PDEVICE_EXTENSION DeviceInfo = Context; - - if (ValueType == REG_DWORD) - { - if (! _wcsicmp(ValueName, REGISTRY_PORT)) - { - DeviceInfo->Port = *(PULONG) ValueData; - DPRINT("Registry port = 0x%x\n", DeviceInfo->Port); - } - - // More to come... (config.c) - } - - else - { - // ? - } - - return STATUS_SUCCESS; -} - - -#if 0 -static NTSTATUS SaveSettings( - IN PWSTR RegistryPath, - IN ULONG Port, - IN ULONG IRQ, - IN ULONG DMA) -/* - Description: - Saves the settings for a particular device - - Parameters: - RegistryPath Where to save the settings to - Port The device's port number - IRQ The device's interrupt number - DMA The device's DMA channel - - Return Value: - NT status STATUS_SUCCESS if successful -*/ -{ -// NTSTATUS s; - - DPRINT("SaveSettings() unimplemented\n"); - -// UNIMPLEMENTED; - - return STATUS_SUCCESS; -} -#endif - Removed: trunk/reactos/drivers/multimedia/audio/mpu401/test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401/test.c (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401/test.c (removed) @@ -1,70 +1,0 @@ -#include <stdio.h> -#include <windows.h> -#include <ntddk.h> -#include "mpu401.h" - -int main() -{ -// NTSTATUS s; -// PHANDLE Handle; -// PIO_STATUS_BLOCK Status; - DWORD BytesReturned; - BYTE Test[3]; // Will store MIDI data - BYTE Notes[] = {50, 52, 54, 55, 57, 59, 61}; - HANDLE Device; - UINT Note; - UINT Junk; - - printf("Test program for MPU401 driver\n"); - - Device = CreateFile("\\\\.\\MPU401_Out_0", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - FILE_FLAG_NO_BUFFERING, - NULL); - - if (Device == INVALID_HANDLE_VALUE) - { - printf("Device is busy or could not be found.\n"); - return -1; - } - - printf("Device is open, let's play some music...\n"); - - Test[0] = 0x90; - Test[2] = 0x7f; - - for (Note = 0; Note < sizeof(Notes); Note ++) - { - Test[1] = Notes[Note]; - - DeviceIoControl( - Device, - IOCTL_MIDI_PLAY, - &Test, - sizeof(Test), - NULL, - 0, - &BytesReturned, - NULL - ); - - for (Junk = 0; Junk < 100000; Junk ++); // Pause - } - - -/* s = IoCreateFile(Handle, GENERIC_READ | GENERIC_WRITE, - OBJ_KERNEL_HANDLE, - Status, - 0, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_OPEN, - FILE_NON_DIRECTORY_FILE, - NULL, - 0, - CreateFileTypeNone, - NULL, - 0); -*/ -} Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c (added) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c Sun Jul 8 20:07:01 2007 @@ -1,0 +1,408 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/dd/mpu401/mpu401.c + * PURPOSE: MPU-401 MIDI device driver + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Sept 26, 2003: Copied from beep.c as template + * Sept 27, 2003: Implemented MPU-401 init & playback + */ + +/* INCLUDES ****************************************************************/ + +#include <ntddk.h> +//#include <ntddbeep.h> + +//#define NDEBUG +#include <debug.h> + +#include "mpu401.h" + + +/* INTERNAL VARIABLES ******************************************************/ + +ULONG DeviceCount = 0; + + +/* FUNCTIONS ***************************************************************/ + +static NTSTATUS InitDevice( + IN PUNICODE_STRING RegistryPath, + IN PVOID Context) +{ +// PDEVICE_INSTANCE Instance = Context; + PDEVICE_OBJECT DeviceObject; // = Context; + PDEVICE_EXTENSION Parameters; // = DeviceObject->DeviceExtension; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\MidiOut0"); + UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\MidiOut0"); +// CONFIG Config; + RTL_QUERY_REGISTRY_TABLE Table[2]; + NTSTATUS s; + + // This is TEMPORARY, to ensure that we don't process more than 1 device. + // I'll remove this limitation in the future. + if (DeviceCount > 0) + { + DPRINT("Sorry - only 1 device supported by MPU401 driver at present :(\n"); + return STATUS_NOT_IMPLEMENTED; + } + + DPRINT("Creating IO device\n"); + + s = IoCreateDevice(Context, // driverobject + sizeof(DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_SOUND, // Correct? + 0, + FALSE, + &DeviceObject); + + if (!NT_SUCCESS(s)) + return s; + + DPRINT("Device Extension at 0x%x\n", DeviceObject->DeviceExtension); + Parameters = DeviceObject->DeviceExtension; + + DPRINT("Creating DOS link\n"); + + /* Create the dos device link */ + IoCreateSymbolicLink(&SymlinkName, + &DeviceName); + + DPRINT("Initializing device\n"); + +// DPRINT("Allocating memory for parameters structure\n"); + // Bodged: +// Parameters = (PDEVICE_EXTENSION)ExAllocatePool(NonPagedPool, sizeof(DEVICE_EXTENSION)); +// DeviceObject->DeviceExtension = Parameters; +// Parameters = Instance->DriverObject->DriverExtension; + + DPRINT("DeviceObject at 0x%x, DeviceExtension at 0x%x\n", DeviceObject, Parameters); + + if (! Parameters) + { + DPRINT("NULL POINTER!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + +// Instance->DriverObject->DriverExtension = Parameters; + + DPRINT("Setting reg path\n"); + Parameters->RegistryPath = RegistryPath; +// Parameters->DriverObject = Instance->DriverObject; + + DPRINT("Zeroing table memory and setting query routine\n"); + RtlZeroMemory(Table, sizeof(Table)); + Table[0].QueryRoutine = LoadSettings; + + DPRINT("Setting port and IRQ defaults\n"); + Parameters->Port = DEFAULT_PORT; + Parameters->IRQ = DEFAULT_IRQ; + +// Only to be enabled once we can get support for multiple cards working :) +/* + DPRINT("Loading settings from: %S\n", RegistryPath); + + s = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, RegistryPath, Table, + &Parameters, NULL); +*/ + + if (! NT_SUCCESS(s)) + return s; + + DPRINT("Port 0x%x IRQ %d\n", Parameters->Port, Parameters->IRQ); + +// Instance->P + + // Enter UART mode (should be done in init phase + if (! InitUARTMode(Parameters->Port)) + { + DPRINT("UART mode initialization FAILED!\n"); + // Set state indication somehow + // Failure - what error code do we give?! + // return STATUS_???? + } + + DeviceCount ++; + + return STATUS_SUCCESS; +} + + +static NTSTATUS STDCALL +MPU401Create(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +/* + * FUNCTION: Handles user mode requests + * ARGUMENTS: + * DeviceObject = Device for request + * Irp = I/O request packet describing request + * RETURNS: Success or failure + */ +{ + DPRINT("MPU401Create() called!\n"); + + // Initialize the MPU-401? + // ... do stuff ... + + + // Play a note to say we're alive: + WaitToSend(MPU401_PORT); + MPU401_WRITE_DATA(MPU401_PORT, 0x90); + WaitToSend(MPU401_PORT); + MPU401_WRITE_DATA(MPU401_PORT, 0x50); + WaitToSend(MPU401_PORT); + MPU401_WRITE_DATA(MPU401_PORT, 0x7f); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, + IO_NO_INCREMENT); + + return(STATUS_SUCCESS); +} + + +static NTSTATUS STDCALL +MPU401Close(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +/* + * FUNCTION: Handles user mode requests + * ARGUMENTS: + * DeviceObject = Device for request + * Irp = I/O request packet describing request + * RETURNS: Success or failure + */ +{ + PDEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT("MPU401Close() called!\n"); + + DeviceExtension = DeviceObject->DeviceExtension; + + Status = STATUS_SUCCESS; + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, + IO_NO_INCREMENT); + + return(Status); +} + + +static NTSTATUS STDCALL +MPU401Cleanup(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +/* + * FUNCTION: Handles user mode requests + * ARGUMENTS: + * DeviceObject = Device for request + * Irp = I/O request packet describing request + * RETURNS: Success or failure + */ +{ + ULONG Channel; + DPRINT("MPU401Cleanup() called!\n"); + + // Reset the device (should we do this?) + for (Channel = 0; Channel <= 15; Channel ++) + { + // All notes off +// MPU401_WRITE_MESSAGE(MPU401_PORT, 0xb0 + Channel, 123, 0); + // All controllers off +// MPU401_WRITE_MESSAGE(MPU401_PORT, 0xb0 + Channel, 121, 0); + } + + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, + IO_NO_INCREMENT); + + return(STATUS_SUCCESS); +} + + +static NTSTATUS STDCALL +MPU401DeviceControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +/* + * FUNCTION: Handles user mode requests + * ARGUMENTS: + * DeviceObject = Device for request + * Irp = I/O request packet describing request + * RETURNS: Success or failure + */ +{ + PIO_STACK_LOCATION Stack; + PDEVICE_EXTENSION DeviceExtension; + ULONG ByteCount; + PUCHAR Data; + + DPRINT("MPU401DeviceControl() called!\n"); + + DeviceExtension = DeviceObject->DeviceExtension; + Stack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("Control code %d [0x%x]\n", Stack->Parameters.DeviceIoControl.IoControlCode, + Stack->Parameters.DeviceIoControl.IoControlCode); + + switch(Stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_MIDI_PLAY : + { + DPRINT("Received IOCTL_MIDI_PLAY\n"); + Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; + + DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); + + for (ByteCount = 0; ByteCount < Stack->Parameters.DeviceIoControl.InputBufferLength; ByteCount ++) + { + DPRINT("0x%x ", Data[ByteCount]); + + MPU401_WRITE_BYTE(DeviceExtension->Port, Data[ByteCount]); +// if (WaitToSend(MPU401_PORT)) +// MPU401_WRITE_DATA(MPU401_PORT, Data[ByteCount]); + } + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return(STATUS_SUCCESS); + } + } + + return(STATUS_SUCCESS); + +/* + DeviceExtension = DeviceObject->DeviceExtension; + Stack = IoGetCurrentIrpStackLocation(Irp); + BeepParam = (PBEEP_SET_PARAMETERS)Irp->AssociatedIrp.SystemBuffer; + + Irp->IoStatus.Information = 0; + + if (Stack->Parameters.DeviceIoControl.IoControlCode != IOCTL_BEEP_SET) + { + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, + IO_NO_INCREMENT); + return(STATUS_NOT_IMPLEMENTED); + } + + if ((Stack->Parameters.DeviceIoControl.InputBufferLength != sizeof(BEEP_SET_PARAMETERS)) + || (BeepParam->Frequency < BEEP_FREQUENCY_MINIMUM) + || (BeepParam->Frequency > BEEP_FREQUENCY_MAXIMUM)) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, + IO_NO_INCREMENT); + return(STATUS_INVALID_PARAMETER); + } + + DueTime.QuadPart = 0; +*/ + /* do the beep!! */ +/* DPRINT("Beep:\n Freq: %lu Hz\n Dur: %lu ms\n", + pbsp->Frequency, + pbsp->Duration); + + if (BeepParam->Duration >= 0) + { + DueTime.QuadPart = (LONGLONG)BeepParam->Duration * -10000; + + KeSetTimer(&DeviceExtension->Timer, + DueTime, + &DeviceExtension->Dpc); + + HalMakeBeep(BeepParam->Frequency); + DeviceExtension->BeepOn = TRUE; + KeWaitForSingleObject(&DeviceExtension->Event, + Executive, + KernelMode, + FALSE, + NULL); + } + else if (BeepParam->Duration == (DWORD)-1) + { + if (DeviceExtension->BeepOn == TRUE) + { + HalMakeBeep(0); + DeviceExtension->BeepOn = FALSE; + } + else + { + HalMakeBeep(BeepParam->Frequency); + DeviceExtension->BeepOn = TRUE; + } + } + + DPRINT("Did the beep!\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, + IO_NO_INCREMENT); + return(STATUS_SUCCESS); +*/ +} + + +static VOID STDCALL +MPU401Unload(PDRIVER_OBJECT DriverObject) +{ + DPRINT("MPU401Unload() called!\n"); +} + + +NTSTATUS STDCALL +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +/* + * FUNCTION: Called by the system to initalize the driver + * ARGUMENTS: + * DriverObject = object describing this driver + * RegistryPath = path to our configuration entries + * RETURNS: Success or failure + */ +{ +// PDEVICE_EXTENSION DeviceExtension; +// PDEVICE_OBJECT DeviceObject; +// DEVICE_INSTANCE Instance; + // Doesn't support multiple instances (yet ...) + NTSTATUS Status; + + DPRINT("MPU401 Device Driver 0.0.1\n"); + + // Is this really necessary? Yes! (Talking to myself again...) +// Instance.DriverObject = DriverObject; + // previous instance = NULL... + +// DeviceExtension->RegistryPath = RegistryPath; + + DriverObject->Flags = 0; + DriverObject->MajorFunction[IRP_MJ_CREATE] = MPU401Create; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = MPU401Close; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = MPU401Cleanup; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = MPU401DeviceControl; + DriverObject->DriverUnload = MPU401Unload; + + // Major hack to just get this damn thing working: + Status = InitDevice(RegistryPath, DriverObject); // ???? + +// DPRINT("Enumerating devices at %wZ\n", RegistryPath); + +// Status = EnumDeviceKeys(RegistryPath, PARMS_SUBKEY, InitDevice, (PVOID)&DeviceObject); // &Instance; + + // check error + + /* set up device extension */ +// DeviceExtension = DeviceObject->DeviceExtension; +// DeviceExtension->BeepOn = FALSE; + + return(STATUS_SUCCESS); +} + +/* EOF */ Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h (added) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h Sun Jul 8 20:07:01 2007 @@ -1,0 +1,155 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/dd/mpu401/mpu401.h + * PURPOSE: MPU-401 MIDI device driver header + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Sept 26, 2003: Created + */ + +#ifndef __INCLUDES_MPU401_H__ +#define __INCLUDES_MPU401_H__ + +//#include <mmsystem.h> +//#include <mmddk.h> +//#include <winioctl.h> +#include "../../../dll/win32/mmdrv/mmdef.h" + +#define DEFAULT_PORT 0x330 +#define DEFAULT_IRQ 9 + +#define DEVICE_SUBKEY L"Devices" +#define PARMS_SUBKEY L"Parameters" + +#define REGISTRY_PORT L"Port" + +// At the moment, we just support a single device with fixed parameters: +#define MPU401_PORT DEFAULT_PORT +#define MPU401_IRQ DEFAULT_IRQ + +#define MPU401_TIMEOUT 10000 + +/* OBSOLETE - see mmdef.h instead: +#define IOCTL_SOUND_BASE FILE_DEVICE_SOUND +// wave base 0 +#define IOCTL_MIDI_BASE 0x0080 + +#define IOCTL_MIDI_GET_CAPABILITIES CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MIDI_SET_STATE CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0002, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_MIDI_GET_STATE CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0003, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_MIDI_SET_VOLUME CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MIDI_GET_VOLUME CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MIDI_PLAY CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0006, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_MIDI_RECORD CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0007, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_MIDI_CACHE_PATCHES CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0008, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_MIDI_CACHE_DRUM_PATCHES CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0009, METHOD_BUFFERED, FILE_WRITE_ACCESS) +*/ + +// The MPU-401 has 2 ports, usually 0x330 and 0x331, which are known as +// "data" and "status/command", respectively. These macros deal with +// reading from and writing to these ports: + +#define MPU401_WRITE_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp, x) +#define MPU401_READ_DATA(bp) READ_PORT_UCHAR((PUCHAR) bp) +#define MPU401_WRITE_COMMAND(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+1, x) +#define MPU401_READ_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp+1) + + +// Flow control + +#define MPU401_READY_TO_SEND(bp) \ + MPU401_READ_STATUS(bp) & 0x80 + +#define MPU401_READY_TO_RECEIVE(bp) \ + MPU401_READ_STATUS(bp) & 0x40 + + +#define MPU401_WRITE_BYTE(bp, x) \ + if (WaitToSend(bp)) MPU401_WRITE_DATA(bp, x) + +#define MPU401_WRITE_MESSAGE(bp, status, da, db) \ + MPU401_WRITE(bp, status); \ + MPU401_WRITE(bp, da); \ + MPU401_WRITE(bp, db) + +//#define MPU401_READ(bp) +// if (WaitToRead(bp)) ... ??? + +/* + DEVICE_EXTENSION contains the settings for each individual device +*/ + +typedef struct _DEVICE_EXTENSION +{ + PUNICODE_STRING RegistryPath; + PDRIVER_OBJECT DriverObject; + ULONG Port; + ULONG IRQ; +// KDPC Dpc; +// KTIMER Timer; +// KEVENT Event; +// BOOLEAN BeepOn; +} DEVICE_EXTENSION, *PDEVICE_EXTENSION; + +/* + DEVICE_INSTANCE contains ??? +*/ + +typedef struct _DEVICE_INSTANCE +{ + // pPrevGDI + PDRIVER_OBJECT DriverObject; +} DEVICE_INSTANCE, *PDEVICE_INSTANCE; + +/* + CONFIG contains device parameters (port/IRQ) + THIS STRUCTURE IS REDUNDANT +*/ + +//typedef struct _CONFIG +//{ +// ULONG Port; +// ULONG IRQ; +//} CONFIG, *PCONFIG; + +/* + Some callback typedefs +*/ + +typedef NTSTATUS REGISTRY_CALLBACK_ROUTINE(PWSTR RegistryPath, PVOID Context); +typedef REGISTRY_CALLBACK_ROUTINE *PREGISTRY_CALLBACK_ROUTINE; + + +/* + Prototypes for functions in portio.c : +*/ + +BOOLEAN WaitToSend(ULONG BasePort); +BOOLEAN WaitToReceive(ULONG BasePort); +BOOLEAN InitUARTMode(ULONG BasePort); + +/* + Prototypes for functions in settings.c : +*/ + +NTSTATUS STDCALL EnumDeviceKeys( + IN PUNICODE_STRING RegistryPath, + IN PWSTR SubKey, + IN PREGISTRY_CALLBACK_ROUTINE Callback, + IN PVOID Context); + +NTSTATUS STDCALL LoadSettings( + IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext); + +NTSTATUS STDCALL +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath); + +#endif Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild (added) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild Sun Jul 8 20:07:01 2007 @@ -1,0 +1,15 @@ + + +<module name="mpu401" type="kernelmodedriver"> + <include base="mpu401_nt4">.</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>mpu401.c</file> + <file>portio.c</file> + <file>settings.c</file> + <file>mpu401.rc</file> +</module> Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc (added) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc Sun Jul 8 20:07:01 2007 @@ -1,0 +1,7 @@ +/* $Id: mpu401.rc 21285 2006-03-10 23:22:58Z jimtabor $ */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "MPU-401 MIDI Driver\0" +#define REACTOS_STR_INTERNAL_NAME "mpu401\0" +#define REACTOS_STR_ORIGINAL_FILENAME "mpu401.sys\0" +#include <reactos/version.rc> Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/portio.c (added) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/portio.c Sun Jul 8 20:07:01 2007 @@ -1,0 +1,96 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/dd/mpu401/portio.c (see also mpu401.h) + * PURPOSE: MPU-401 MIDI port I/O helper + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Sept 26, 2003: Created + */ + +#include <ntddk.h> +#include "mpu401.h" + + +BOOLEAN WaitToSend(ULONG BasePort) +{ + int TimeOut; + + DbgPrint("WaitToSend "); + + // Check if it's OK to send + for (TimeOut = MPU401_TIMEOUT; + ! MPU401_READY_TO_SEND(BasePort) && TimeOut > 0; + TimeOut --); + + // If a time-out occurs, we report failure + if (! TimeOut) + { + DbgPrint("FAILED\n"); + return FALSE; + } + + DbgPrint("SUCCEEDED\n"); + + return TRUE; +} + + +BOOLEAN WaitToReceive(ULONG BasePort) +{ + int TimeOut; + + DbgPrint("WaitToSend "); + + // Check if it's OK to receive + for (TimeOut = MPU401_TIMEOUT; + ! MPU401_READY_TO_RECEIVE(BasePort) && TimeOut > 0; + TimeOut --); + + // If a time-out occurs, we report failure + if (! TimeOut) + { + DbgPrint("FAILED\n"); + return FALSE; + } + + DbgPrint("SUCCEEDED\n"); + + return TRUE; +} + + +BOOLEAN InitUARTMode(ULONG BasePort) +{ + ULONG TimeOut; + UCHAR Status = 0; + + DbgPrint("InitUARTMode() called\n"); + + // Check if it's OK to send + if (! WaitToSend(BasePort)) + return FALSE; + + DbgPrint("Resetting MPU401\n"); + + // Send an MPU reset: + MPU401_WRITE_COMMAND(BasePort, 0xff); + + // Check if it's OK to receive (some cards will ignore the above reset + // command and so will not issue an ACK, so time out is NOT an error) + DbgPrint("Waiting for an ACK\n"); + if (WaitToReceive(BasePort)) + { + // Check to make sure the reset was acknowledged: + for (TimeOut = MPU401_TIMEOUT; + (Status = (MPU401_READ_DATA(BasePort) & 0xfe) && TimeOut > 0); + TimeOut --); + } + + DbgPrint("Entering UART mode\n"); + // Now we kick the MPU401 into UART ("dumb") mode + MPU401_WRITE_COMMAND(BasePort, 0x3f); + + return TRUE; +} Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/readme.txt (added) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/readme.txt Sun Jul 8 20:07:01 2007 @@ -1,0 +1,28 @@ +---------------------------------- +REACTOS MPU-401 MIDI DEVICE DRIVER +by Andrew Greenwood +---------------------------------- + +This driver initializes the MPU-401 MIDI/joystick port found on +most sound cards, and allows the sending of simple messages. + +It's far from complete, and at present will only support 1 device. + +In Bochs, the MIDI output will be played using whatever device is +set up in Windows as your MIDI output. + +For real hardware, the output will be played to whatever device is +attached to your MIDI/joystick port, or, in some cases, the wave-table +or other synth on-board your card (note: this is NOT an FM synth +driver!) + + +Thanks to Vizzini and all the other great ReactOS developers for +helping me code this driver and also for giving me encouragement. + +I'd also like to thank Jeff Glatt, whose MIDI and MPU-401 +documentation has been a valuable resource to me over the past few +years, and who provided me with almost all of my knowledge of MIDI +and MPU-401. His site is at: www.borg.com/~jglatt/ + +- Andrew "Silver Blade" Greenwood Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/sbdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/sbdebug.h (added) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/sbdebug.h Sun Jul 8 20:07:01 2007 @@ -1,0 +1,24 @@ +#ifndef NDEBUG +#define TEST_STATUS(s) \ + if (! NT_SUCCESS(s)) \ + { \ + if (s == STATUS_NO_MORE_ENTRIES) \ + DPRINT("NTSTATUS == NO MORE ENTRIES\n") \ + else if (s == STATUS_BUFFER_OVERFLOW) \ + DPRINT("NTSTATUS == BUFFER OVERFLOW\n") \ + else if (s == STATUS_BUFFER_TOO_SMALL) \ + DPRINT("NTSTATUS == BUFFER TOO SMALL\n") \ + else if (s == STATUS_INVALID_PARAMETER) \ + DPRINT("NTSTATUS == INVALID PARAMETER\n") \ + else if (s == STATUS_OBJECT_NAME_NOT_FOUND) \ + DPRINT("NTSTATUS == OBJECT NAME NOT FOUND\n") \ + else if (s == STATUS_INVALID_HANDLE) \ + DPRINT("NTATATUS == INVALID_HANDLE\n") \ + else if (s == STATUS_ACCESS_DENIED) \ + DPRINT("NTSTATUS == ACCESS_DENIED\n") \ + else \ + DPRINT("NTSTATUS == FAILURE (?)\n"); \ + } +#else +#define TEST_STATUS(s) +#endif Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/settings.c (added) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/settings.c Sun Jul 8 20:07:01 2007 @@ -1,0 +1,307 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/dd/mpu401/settings.c + * PURPOSE: MPU-401 MIDI device driver setting management + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Sept 27, 2003: Created + */ + +#include <ntddk.h> + +#include "mpu401.h" + +#define NDEBUG +#include <debug.h> +#include "sbdebug.h" // our own debug helper + +#if 0 +static NTSTATUS +OpenDevicesKey( + IN PWSTR RegistryPath, + OUT PHANDLE Key) +/* + Description: + Create a volatile key under this driver's Services node to contain + the device name list. + + Parameters: + RegistryPath The location of the registry entry + Key The key in the registry + + Return Value: + NT status STATUS_SUCCESS if successful (duh...) +*/ +{ + NTSTATUS s; + HANDLE hKey; + OBJECT_ATTRIBUTES oa; + UNICODE_STRING uStr; + + // Attempt to open the key + + RtlInitUnicodeString(&uStr, RegistryPath); + + InitializeObjectAttributes(&oa, &uStr, OBJ_CASE_INSENSITIVE, NULL, + (PSECURITY_DESCRIPTOR)NULL); + + s = ZwOpenKey(&hKey, KEY_CREATE_SUB_KEY, &oa); + + if (! NT_SUCCESS(s)) + return s; // Problem + + + // Now create sub key + + RtlInitUnicodeString(&uStr, (PWSTR) DEVICE_SUBKEY); + + InitializeObjectAttributes(&oa, &uStr, OBJ_CASE_INSENSITIVE, hKey, + (PSECURITY_DESCRIPTOR)NULL); + + s = ZwCreateKey(Key, KEY_ALL_ACCESS, &oa, 0, NULL, REG_OPTION_VOLATILE, + NULL); + + ZwClose(hKey); + + return s; +} +#endif + + +NTSTATUS STDCALL EnumDeviceKeys( + IN PUNICODE_STRING RegistryPath, + IN PWSTR SubKey, + IN PREGISTRY_CALLBACK_ROUTINE Callback, + IN PVOID Context) +/* + Description: + Enumerate the device subkeys in the driver's registry entry, and + call the specified callback routine for each device. + + Parameters: + RegistryPath The location of the registry entry + Subkey The device's subkey + Callback A routine called for each device + Context ??? + + Return Value: + NT status STATUS_SUCCESS if successful +*/ +{ + NTSTATUS s; + OBJECT_ATTRIBUTES oa; + HANDLE hKey, hSubKey; + UNICODE_STRING SubkeyName; + ULONG i; + + // Attempt to open the key + + InitializeObjectAttributes(&oa, RegistryPath, OBJ_CASE_INSENSITIVE, + NULL, (PSECURITY_DESCRIPTOR)NULL); + + s = ZwOpenKey(&hKey, KEY_READ, &oa); + + TEST_STATUS(s); // debugging + + if (! NT_SUCCESS(s)) + return s; // Problem + + RtlInitUnicodeString(&SubkeyName, SubKey); + + DPRINT("Subkey: %wZ\n", &SubkeyName); + + InitializeObjectAttributes(&oa, &SubkeyName, OBJ_CASE_INSENSITIVE, + hKey, (PSECURITY_DESCRIPTOR)NULL); + + s = ZwOpenKey(&hSubKey, KEY_ENUMERATE_SUB_KEYS, &oa); + + ZwClose(hKey); + + TEST_STATUS(s); // debugging + + if (! NT_SUCCESS(s)) + return s; + + + // And now, the enumeration + + for (i = 0;; i ++) + { + KEY_BASIC_INFORMATION Info; + PKEY_BASIC_INFORMATION pInfo; + ULONG ResultLength = 0; + ULONG Size = 0; + PWSTR Pos; + PWSTR Name; + + // Find the length of the subkey data + +// Info.NameLength = 0; // TEMPORARY! + + s = ZwEnumerateKey(hSubKey, i, KeyBasicInformation, &Info, + sizeof(Info), &ResultLength); + + if (s == STATUS_NO_MORE_ENTRIES) + break; + + DPRINT("Found an entry, allocating memory...\n"); + +// Size = Info.NameLength + FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]); + Size = ResultLength + FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]); + + DPRINT("Size is %d\n", Size); + + pInfo = (PKEY_BASIC_INFORMATION) ExAllocatePool(PagedPool, Size); + + if (pInfo == NULL) + { + DPRINT("INSUFFICIENT RESOURCES!\n"); + s = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + DPRINT("Re-enumerating...\n"); + + s = ZwEnumerateKey(hSubKey, i, KeyBasicInformation, pInfo, Size, + &ResultLength); + +// TEST_STATUS(s); // debugging + + if (! NT_SUCCESS(s)) + { + ExFreePool((PVOID) pInfo); + s = STATUS_INTERNAL_ERROR; + break; + } + + DPRINT("Allocating memory for name...\n"); + + Name = ExAllocatePool(PagedPool, + RegistryPath->Length + sizeof(WCHAR) + + SubkeyName.Length + sizeof(WCHAR) + + pInfo->NameLength + sizeof(UNICODE_NULL)); + + if (Name == NULL) + { + DPRINT("INSUFFICIENT RESOURCES!"); + ExFreePool((PVOID) pInfo); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Copy the key name + RtlCopyMemory((PVOID)Name, (PVOID)RegistryPath->Buffer, RegistryPath->Length); + Pos = Name + (RegistryPath->Length / sizeof(WCHAR)); + Pos[0] = '\\'; + Pos++; + + // Copy the parameters sub key name + RtlCopyMemory((PVOID)Pos, (PVOID)SubKey, SubkeyName.Length); //SubkeyName? + Pos += SubkeyName.Length / sizeof(WCHAR); + Pos[0] = '\\'; + Pos ++; + + // Copy the device sub key name + RtlCopyMemory((PVOID)Pos, (PVOID)pInfo->Name, pInfo->NameLength); + Pos += pInfo->NameLength / sizeof(WCHAR); + Pos[0] = UNICODE_NULL; + + ExFreePool((PVOID)pInfo); + + DPRINT("Calling callback...\n"); + + s = (*Callback)(Name, Context); + + if (! NT_SUCCESS(s)) + { DPRINT("Callback FAILED\n"); + break;} + } + + ZwClose(hSubKey); + + DPRINT("%d device registry keys found\n", i); + + if ((i == 0) && (s == STATUS_NO_MORE_ENTRIES)) + return STATUS_DEVICE_CONFIGURATION_ERROR; + + return s == STATUS_NO_MORE_ENTRIES ? STATUS_SUCCESS : s; +} + + + +NTSTATUS STDCALL LoadSettings( + IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +/* + Description: + Read the settings for a particular device + + Parameters: + ValueName The value to read from the registry + ValueType ? + ValueData ? + ValueLength ? + Context The configuration structure to write to + EntryContext ? + + Return Value: + NT status STATUS_SUCCESS if successful +*/ +{ + PDEVICE_EXTENSION DeviceInfo = Context; + + if (ValueType == REG_DWORD) + { + if (! _wcsicmp(ValueName, REGISTRY_PORT)) + { + DeviceInfo->Port = *(PULONG) ValueData; + DPRINT("Registry port = 0x%x\n", DeviceInfo->Port); + } + + // More to come... (config.c) + } + + else + { + // ? + } + + return STATUS_SUCCESS; +} + + +#if 0 +static NTSTATUS SaveSettings( + IN PWSTR RegistryPath, + IN ULONG Port, + IN ULONG IRQ, + IN ULONG DMA) +/* + Description: + Saves the settings for a particular device + + Parameters: + RegistryPath Where to save the settings to + Port The device's port number + IRQ The device's interrupt number + DMA The device's DMA channel + + Return Value: + NT status STATUS_SUCCESS if successful +*/ +{ +// NTSTATUS s; + + DPRINT("SaveSettings() unimplemented\n"); + +// UNIMPLEMENTED; + + return STATUS_SUCCESS; +} +#endif + Added: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/test.c (added) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/test.c Sun Jul 8 20:07:01 2007 @@ -1,0 +1,70 @@ +#include <stdio.h> +#include <windows.h> +#include <ntddk.h> +#include "mpu401.h" + +int main() +{ +// NTSTATUS s; +// PHANDLE Handle; +// PIO_STATUS_BLOCK Status; + DWORD BytesReturned; + BYTE Test[3]; // Will store MIDI data + BYTE Notes[] = {50, 52, 54, 55, 57, 59, 61}; + HANDLE Device; + UINT Note; + UINT Junk; + + printf("Test program for MPU401 driver\n"); + + Device = CreateFile("\\\\.\\MPU401_Out_0", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_FLAG_NO_BUFFERING, + NULL); + + if (Device == INVALID_HANDLE_VALUE) + { + printf("Device is busy or could not be found.\n"); + return -1; + } + + printf("Device is open, let's play some music...\n"); + + Test[0] = 0x90; + Test[2] = 0x7f; + + for (Note = 0; Note < sizeof(Notes); Note ++) + { + Test[1] = Notes[Note]; + + DeviceIoControl( + Device, + IOCTL_MIDI_PLAY, + &Test, + sizeof(Test), + NULL, + 0, + &BytesReturned, + NULL + ); + + for (Junk = 0; Junk < 100000; Junk ++); // Pause + } + + +/* s = IoCreateFile(Handle, GENERIC_READ | GENERIC_WRITE, + OBJ_KERNEL_HANDLE, + Status, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + FILE_NON_DIRECTORY_FILE, + NULL, + 0, + CreateFileTypeNone, + NULL, + 0); +*/ +}

1 0

[greatlrd] 27484: patch from Yaroslav Ponomarenko yarryp at gmail dot com Implement so spi_ msg works now with swamp mouse buttun, but it seam our msg quare does not support it yet or must we send a msg from spi msg we change the mouse buttun to notify the program. either way it is now partly supported by his patch
by greatlrd＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: greatlrd Date: Sun Jul 8 19:58:47 2007 New Revision: 27484 URL: http://svn.reactos.org/svn/reactos?rev=27484&view=rev Log: patch from Yaroslav Ponomarenko yarryp at gmail dot com Implement so spi_ msg works now with swamp mouse buttun, but it seam our msg quare does not support it yet or must we send a msg from spi msg we change the mouse buttun to notify the program. either way it is now partly supported by his patch Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Sun Jul 8 19:58:47 2007 @@ -967,6 +967,7 @@ case SPI_SETMOUSEHOVERHEIGHT: case SPI_SETMOUSE: case SPI_SETMOUSESPEED: + case SPI_SETMOUSEBUTTONSWAP: /* We will change something, so set the flag here */ bChanged = TRUE; case SPI_GETDESKWALLPAPER: @@ -1081,6 +1082,10 @@ CurInfo = IntGetSysCursorInfo(WinStaObject); CurInfo->MouseHoverHeight = uiParam; break; + case SPI_SETMOUSEBUTTONSWAP: + CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo->SwapButtons = uiParam; + break; case SPI_SETMOUSE: CurInfo = IntGetSysCursorInfo(WinStaObject); CurInfo->CursorAccelerationInfo = *(PCURSORACCELERATION_INFO)pvParam;

1 0

[silverblade] 27483: Kernel-mode COM rough implementation for KS. Forgot to add to SVN on last commit.
by silverblade＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: silverblade Date: Sun Jul 8 19:54:12 2007 New Revision: 27483 URL: http://svn.reactos.org/svn/reactos?rev=27483&view=rev Log: Kernel-mode COM rough implementation for KS. Forgot to add to SVN on last commit. Added: trunk/reactos/drivers/ksfilter/ks/kcom.c Added: trunk/reactos/drivers/ksfilter/ks/kcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kcom.c (added) +++ trunk/reactos/drivers/ksfilter/ks/kcom.c Sun Jul 8 19:54:12 2007 @@ -1,0 +1,51 @@ +/* =============================================================== + Kernel-mode COM +*/ + +#include <windows.h> +#include <ntddk.h> +#include <ks.h> +#include <kcom.h> +#include <debug.h> + + +/* http://msdn2.microsoft.com/en-us/library/ms809781.aspx */ +COMDDKAPI NTSTATUS NTAPI +KoCreateInstance( + IN REFCLSID ClassId, + IN IUnknown* UnkOuter OPTIONAL, + IN ULONG ClsContext, + IN REFIID InterfaceId, + OUT PVOID* Interface) +{ + /* If UnkOuter isn't NULL, it must be IUnknown - TODO: CHECK THIS PARAM */ + /* TODO: Check IRQL? */ + + DPRINT("KoCreateInstance called\n"); + + if ( ClsContext != CLSCTX_KERNEL_SERVER ) + { + DPRINT("FAILED: ClsContext must be CLSCTX_KERNEL_SERVER\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* + Find the desired interface and create an instance. + + But we also need to supply a + pointer which will be set to a list of available interfaces, to + IoGetDeviceInterfaces. + + We can then create a file based on this information and thus talk + to the appropriate device. + + Useful references: + http://www.freelists.org/archives/wdmaudiodev/01-2003/msg00023.html + + TODO + */ + + DPRINT("** FAKING SUCCESS **\n"); + + return STATUS_SUCCESS; +}

1 0

[greatlrd] 27482: correct fix for log10.
by greatlrd＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: greatlrd Date: Sun Jul 8 19:33:38 2007 New Revision: 27482 URL: http://svn.reactos.org/svn/reactos?rev=27482&view=rev Log: correct fix for log10. Modified: trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/log1… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s (original) +++ trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s Sun Jul 8 19:33:38 2007 @@ -15,11 +15,13 @@ /* FUNCTIONS ***************************************************************/ _log10: - push ebp - mov ebp,esp - fldlg2 - fld qword ptr [ebp+8] - fyl2x - pop ebp - ret + push ebp + mov ebp,esp + fld qword ptr [ebp+8] ; Load real from stack + fldlg2 ; Load log base 10 of 2 + fxch st(1) ; Exchange st, st(1) + fyl2x ; Compute the log base 10(x) + pop ebp + ret +

1 0

[greatlrd] 27481: define WINE_NATIVEWIN32 so we activate parelles changes.
by greatlrd＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: greatlrd Date: Sun Jul 8 19:19:43 2007 New Revision: 27481 URL: http://svn.reactos.org/svn/reactos?rev=27481&view=rev Log: define WINE_NATIVEWIN32 so we activate parelles changes. Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.rbuild branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.rbuild branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.rbuild (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.rbuild Sun Jul 8 19:19:43 2007 @@ -9,6 +9,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + <define name="WINE_NATIVEWIN32" /> <library>wine</library> <library>uuid</library> <library>ntdll</library> Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.rbuild (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.rbuild Sun Jul 8 19:19:43 2007 @@ -9,6 +9,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + <define name="WINE_NATIVEWIN32" /> <library>wine</library> <library>uuid</library> <library>ntdll</library> Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild Sun Jul 8 19:19:43 2007 @@ -9,6 +9,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + <define name="WINE_NATIVEWIN32" /> <library>wine</library> <library>uuid</library> <library>ntdll</library> Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild Sun Jul 8 19:19:43 2007 @@ -9,6 +9,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + <define name="WINE_NATIVEWIN32" /> <library>wine</library> <library>uuid</library> <library>ntdll</library> Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild Sun Jul 8 19:19:43 2007 @@ -9,6 +9,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + <define name="WINE_NATIVEWIN32" /> <library>wine</library> <library>uuid</library> <library>ntdll</library>

1 0

[greatlrd] 27480: fixing some problem with parelles rbuild files
by greatlrd＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: greatlrd Date: Sun Jul 8 19:10:33 2007 New Revision: 27480 URL: http://svn.reactos.org/svn/reactos?rev=27480&view=rev Log: fixing some problem with parelles rbuild files Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/version.rc (with props) Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild branches/reactx/reactos/dll/directx/directx.rbuild Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild Sun Jul 8 19:10:33 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <group> -<directory name="WineD3D-0.9.36-Parallels"> +<directory name="dlls"> <xi:include href="dlls/dlls.rbuild" /> </directory> </group> Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/version.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/version.rc (added) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/version.rc Sun Jul 8 19:10:33 2007 @@ -1,0 +1,27 @@ +/* + * Copyright 2001 Ove Kaaven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine WineD3D OpenGL ICD" +#define WINE_FILENAME_STR "wined3d.dll" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" + +#include "wine/wine_common_ver.rc" Propchange: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild Sun Jul 8 19:10:33 2007 @@ -1,6 +1,6 @@ -<module name="wine3d" type="win32dll" entrypoint="0" installbase="system32" installname="wine3d.dll"> - <importlibrary definition="wine3d.def" /> - <include base="wine3d">.</include> +<module name="wined3d" type="win32dll" entrypoint="0" installbase="system32" installname="wined3d.dll"> + <importlibrary definition="wined3d.def" /> + <include base="wined3d">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> Modified: branches/reactx/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/dire… ============================================================================== --- branches/reactx/reactos/dll/directx/directx.rbuild (original) +++ branches/reactx/reactos/dll/directx/directx.rbuild Sun Jul 8 19:10:33 2007 @@ -7,12 +7,15 @@ <directory name="devenum"> <xi:include href="devenum/devenum.rbuild" /> </directory> + <directory name="dinput"> <xi:include href="dinput/dinput.rbuild" /> </directory> + <directory name="dinput8"> <xi:include href="dinput8/dinput8.rbuild" /> </directory> @@ -28,14 +31,15 @@ <directory name="dxdiagn"> <xi:include href="dxdiagn/dxdiagn.rbuild" /> </directory> + +<directory name="WineD3D-0.9.36-Parallels"> <xi:include href="WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild" /> </directory> </group>

1 0

[greatlrd] 27479: fixing smaller typo in ddrawex rbuild file
by greatlrd＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: greatlrd Date: Sun Jul 8 18:58:55 2007 New Revision: 27479 URL: http://svn.reactos.org/svn/reactos?rev=27479&view=rev Log: fixing smaller typo in ddrawex rbuild file Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild Sun Jul 8 18:58:55 2007 @@ -1,4 +1,4 @@ -<module name="dplay" type="ddrawex" entrypoint="0" installbase="system32" installname="ddrawex.dll"> +<module name="ddrawex" type="win32dll" entrypoint="0" installbase="system32" installname="ddrawex.dll"> <importlibrary definition="ddrawex.def" /> <include base="ddrawex">.</include> <include base="ReactOS">include/reactos/wine</include>

1 0

[greatlrd] 27478: ading rbuild files to parelles ------------------------------ does not builds yet.
by greatlrd＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: greatlrd Date: Sun Jul 8 18:56:18 2007 New Revision: 27478 URL: http://svn.reactos.org/svn/reactos?rev=27478&view=rev Log: ading rbuild files to parelles ------------------------------ does not builds yet. Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.rbuild (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.rbuild (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild (with props) Modified: branches/reactx/reactos/dll/directx/directx.rbuild Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild (added) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild Sun Jul 8 18:56:18 2007 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<group> +<directory name="WineD3D-0.9.36-Parallels"> + <xi:include href="dlls/dlls.rbuild" /> +</directory> +</group> + Propchange: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.rbuild (added) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.rbuild Sun Jul 8 18:56:18 2007 @@ -1,0 +1,40 @@ +<module name="d3d8" type="win32dll" entrypoint="0" installbase="system32" installname="d3d8.dll"> + <importlibrary definition="d3d8.def" /> + <include base="d3d8">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>winmm</library> + <library>dxguid</library> + + <file>basetexture.c</file> + <file>cubetexture.c</file> + <file>d3d8_main.c</file> + <file>device.c</file> + <file>directx.c</file> + <file>indexbuffer.c</file> + <file>pixelshader.c</file> + <file>resource.c</file> + <file>stateblock.c</file> + <file>surface.c</file> + <file>swapchain.c</file> + <file>texture.c</file> + <file>vertexbuffer.c</file> + <file>vertexdeclaration.c</file> + <file>vertexshader.c</file> + <file>volume.c</file> + <file>volumetexture.c</file> + <file>version.rc</file> +</module> Propchange: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.rbuild (added) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.rbuild Sun Jul 8 18:56:18 2007 @@ -1,0 +1,41 @@ +<module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll"> + <importlibrary definition="d3d9.def" /> + <include base="d3d9">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>winmm</library> + <library>dxguid</library> + + <file>basetexture.c</file> + <file>cubetexture.c</file> + <file>d3d9_main.c</file> + <file>device.c</file> + <file>directx.c</file> + <file>indexbuffer.c</file> + <file>pixelshader.c</file> + <file>query.c</file> + <file>resource.c</file> + <file>stateblock.c</file> + <file>surface.c</file> + <file>swapchain.c</file> + <file>texture.c</file> + <file>vertexbuffer.c</file> + <file>vertexdeclaration.c</file> + <file>vertexshader.c</file> + <file>volume.c</file> + <file>volumetexture.c</file> + <file>version.rc</file> +</module> Propchange: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild (added) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild Sun Jul 8 18:56:18 2007 @@ -1,0 +1,42 @@ +<module name="ddraw" type="win32dll" entrypoint="0" installbase="system32" installname="ddraw.dll"> + <importlibrary definition="ddraw.def" /> + <include base="ddraw">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>winmm</library> + <library>dxguid</library> + + <file>clipper.c</file> + <file>ddraw.c</file> + <file>ddraw_thunks.c</file> + <file>device.c</file> + <file>direct3d.c</file> + <file>executebuffer.c</file> + <file>gamma.c</file> + <file>light.c</file> + <file>main.c</file> + <file>material.c</file> + <file>palette.c</file> + <file>parent.c</file> + <file>regsvr.c</file> + <file>surface.c</file> + <file>surface_thunks.c </file> + <file>texture.c</file> + <file>utils.c</file> + <file>vertexbuffer.c</file> + <file>viewport.c</file> + <file>version.rc</file> +</module> Propchange: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild (added) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild Sun Jul 8 18:56:18 2007 @@ -1,0 +1,25 @@ +<module name="dplay" type="ddrawex" entrypoint="0" installbase="system32" installname="ddrawex.dll"> + <importlibrary definition="ddrawex.def" /> + <include base="ddrawex">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>winmm</library> + <library>dxguid</library> + + <file>main.c</file> + <file>regsvr.c</file> + <file>version.rc</file> +</module> Propchange: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild (added) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild Sun Jul 8 18:56:18 2007 @@ -1,0 +1,51 @@ +<module name="wine3d" type="win32dll" entrypoint="0" installbase="system32" installname="wine3d.dll"> + <importlibrary definition="wine3d.def" /> + <include base="wine3d">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>winmm</library> + <library>dxguid</library> + + <file>arb_program_shader.c</file> + <file>baseshader.c</file> + <file>basetexture.c</file> + <file>context.c</file> + <file>cubetexture.c</file> + <file>device.c</file> + <file>directx.c</file> + <file>drawprim.c</file> + <file>glsl_shader.c</file> + <file>indexbuffer.c</file> + <file>palette.c</file> + <file>pglmini.c</file> + <file>pixelshader.c</file> + <file>query.c</file> + <file>resource.c</file> + <file>state.c</file> + <file>stateblock.c</file> + <file>surface.c</file> + <file>surface_gdi.c </file> + <file>swapchain.c</file> + <file>texture.c</file> + <file>utils.c</file> + <file>vertexbuffer.c</file> + <file>vertexdeclaration.c</file> + <file>vertexshader.c</file> + <file>volume.c</file> + <file>volumetexture.c</file> + <file>wined3d_main.c</file> + <file>version.rc</file> +</module> Propchange: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/dire… ============================================================================== --- branches/reactx/reactos/dll/directx/directx.rbuild (original) +++ branches/reactx/reactos/dll/directx/directx.rbuild Sun Jul 8 18:56:18 2007 @@ -34,5 +34,9 @@ <directory name="d3d9"> <xi:include href="d3d9/d3d9.rbuild" /> </directory> + +<directory name="d3d9"> + <xi:include href="WineD3D-0.9.36-Parallels/WineD3D-0.9.36-Parallels.rbuild" /> +</directory> </group>

1 0

[cwittich] 27477: -set eol-style:native -fix line endings
by cwittich＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: cwittich Date: Sun Jul 8 18:50:25 2007 New Revision: 27477 URL: http://svn.reactos.org/svn/reactos?rev=27477&view=rev Log: -set eol-style:native -fix line endings Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/helper/ResourceList.c (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniport.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportDMus.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportMidi.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportTopology.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportWaveCyclic.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportWavePci.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/factory.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPort.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortDMus.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortMidi.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortTopology.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortWaveCyclic.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortWavePci.cpp (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/port/factory.c (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/port/port.h (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h (contents, props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c (props changed) trunk/reactos/drivers/wdm/audio/backpln/stdunk/stdunk.c (props changed) trunk/reactos/drivers/wdm/audio/backpln/stdunk/stdunk.cpp (props changed) trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild (contents, props changed) trunk/reactos/drivers/wdm/audio/drivers/mpu401_ks/adapter.cpp (props changed) trunk/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.def (props changed) trunk/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rbuild (props changed) trunk/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rc (props changed) trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/adapter.cpp (props changed) trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/main.cpp (props changed) trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.h (props changed) trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.rbuild (props changed) trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16_ks.def (props changed) trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/stdunk.cpp (props changed) trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.def (props changed) trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild (props changed) trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rc (props changed) trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp (props changed) trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c (props changed) trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild (props changed) trunk/reactos/drivers/wdm/wdm.rbuild (contents, props changed) Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/helper/ResourceList.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniport.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportDMus.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportMidi.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportTopology.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportWaveCyclic.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportWavePci.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/factory.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPort.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortDMus.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortMidi.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortTopology.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortWaveCyclic.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortWavePci.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/factory.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/port.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Sun Jul 8 18:50:25 2007 @@ -8,8 +8,8 @@ #define PORTCLS_PRIVATE_H #include <windows.h> -#include <ntddk.h> -#include <debug.h> +#include <ntddk.h> +#include <debug.h> #include <portcls.h> Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/stdunk/stdunk.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/backpln/stdunk/stdunk.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild (original) +++ trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild Sun Jul 8 18:50:25 2007 @@ -1,3 +1,3 @@ -<directory name="mpu401_ks"> - <xi:include href="mpu401_ks/mpu401.rbuild" /> +<directory name="mpu401_ks"> + <xi:include href="mpu401_ks/mpu401.rbuild" /> </directory> Propchange: trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/mpu401_ks/adapter.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/adapter.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/main.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16_ks.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drivers/sb16_ks/stdunk.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/drivers/wdm/wdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/wdm.rbuild?rev… ============================================================================== --- trunk/reactos/drivers/wdm/wdm.rbuild (original) +++ trunk/reactos/drivers/wdm/wdm.rbuild Sun Jul 8 18:50:25 2007 @@ -1,3 +1,3 @@ -<directory name="audio"> - <xi:include href="audio/directory.rbuild" /> +<directory name="audio"> + <xi:include href="audio/directory.rbuild" /> </directory> Propchange: trunk/reactos/drivers/wdm/wdm.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 27476: -release spinlocks before calling IoCompleteRequest -fix some format strings
by cwittich＠svn.reactos.org 08 Jul '07

08 Jul '07

Author: cwittich Date: Sun Jul 8 18:27:17 2007 New Revision: 27476 URL: http://svn.reactos.org/svn/reactos?rev=27476&view=rev Log: -release spinlocks before calling IoCompleteRequest -fix some format strings Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sun Jul 8 18:27:17 2007 @@ -1568,7 +1568,7 @@ if (ConfigInfo.Parameter != NULL) ExFreePool(ConfigInfo.Parameter); - DPRINT("ScsiPortInitialize() done, Status = 0x%08X, DeviceFound = %b!\n", + DPRINT("ScsiPortInitialize() done, Status = 0x%08X, DeviceFound = %d!\n", Status, DeviceFound); return (DeviceFound == FALSE) ? Status : STATUS_SUCCESS; @@ -2524,6 +2524,7 @@ { /* Get next logical unit request */ SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); /* SpiGetNextRequestFromLun() releases the spinlock */ KeLowerIrql(Irql); @@ -4157,6 +4158,7 @@ { /* Start the next packet */ SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); } else { @@ -4164,7 +4166,7 @@ KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); } - DPRINT("IoCompleting request IRP 0x%08X\n", Irp); + DPRINT("IoCompleting request IRP 0x%08p\n", Irp); IoCompleteRequest(Irp, IO_DISK_INCREMENT); @@ -4272,7 +4274,10 @@ && (Srb->SrbFlags & SRB_FLAGS_NO_QUEUE_FREEZE)) { if (LunExtension->RequestTimeout == -1) + { SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); + } else KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs