Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[hpoussin] 26109: Fix compilation of drivers ks, mpu401_ks and sb16_nt4
by hpoussin＠svn.reactos.org 15 Mar '07

15 Mar '07

Author: hpoussin Date: Thu Mar 15 22:00:34 2007 New Revision: 26109 URL: http://svn.reactos.org/svn/reactos?rev=26109&view=rev Log: Fix compilation of drivers ks, mpu401_ks and sb16_nt4 Modified: trunk/reactos/drivers/multimedia/ks/irp.c trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/drivers/multimedia/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/irp.… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/irp.c (original) +++ trunk/reactos/drivers/multimedia/ks/irp.c Thu Mar 15 22:00:34 2007 @@ -577,7 +577,7 @@ DPRINT1("KS IRP dispatch function called\n"); - PKSDISPATCH_TABLE ks_dispatch_table = NULL; + //PKSDISPATCH_TABLE ks_dispatch_table = NULL; /* ks_dispatch_table is the first element in a structure pointed to by FsContext */ Modified: trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/mpu401_… ============================================================================== --- trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp (original) +++ trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp Thu Mar 15 22:00:34 2007 @@ -14,6 +14,7 @@ #define PUT_GUIDS_HERE +#define INITGUID #include <portcls.h> extern "C" Modified: trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c (original) +++ trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c Thu Mar 15 22:00:34 2007 @@ -14,7 +14,7 @@ return TRUE; } -BOOLEAN +BOOLEAN NTAPI ServiceSoundBlasterInterrupt( IN PKINTERRUPT Interrupt, IN PVOID Context) @@ -42,7 +42,7 @@ DPRINT("Vector is 0x%x\n", vector); - status = IoConnectInterrupt(parameters->interrupt, + status = IoConnectInterrupt(&parameters->interrupt, ServiceSoundBlasterInterrupt, DeviceObject, (PKSPIN_LOCK) NULL, Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h (original) +++ trunk/reactos/include/ddk/portcls.h Thu Mar 15 22:00:34 2007 @@ -141,7 +141,7 @@ Class IDs - TODO */ //#define CLSID_PortDMus /* dmusicks.h */ -#define CLSID_PortMidi +DEFINE_GUID(CLSID_PortMidi,0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); #define CLSID_PortTopology #define CLSID_PortWaveCyclic #define CLSID_PortWavePci @@ -151,7 +151,7 @@ #define CLSID_MiniportDriverDMusUARTCapture #define CLSID_MiniportDriverFmSynth #define CLSID_MiniportDriverFmSynthWithVol -#define CLSID_MiniportDriverUart +DEFINE_GUID(CLSID_MiniportDriverUart,0xb4c90ae1L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); /* ===============================================================

1 0

[hpoussin] 26108: Add missing #endif
by hpoussin＠svn.reactos.org 15 Mar '07

15 Mar '07

Author: hpoussin Date: Thu Mar 15 19:32:56 2007 New Revision: 26108 URL: http://svn.reactos.org/svn/reactos?rev=26108&view=rev Log: Add missing #endif Modified: trunk/reactos/include/psdk/intrin_x86.h Modified: trunk/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_x86.h (original) +++ trunk/reactos/include/psdk/intrin_x86.h Thu Mar 15 19:32:56 2007 @@ -943,4 +943,6 @@ __asm__ __volatile__("wbinvd"); } +#endif /* KJK_INTRIN_X86_H_ */ + /* EOF */

1 0

[hpoussin] 26107: Split intrin.h file into architecture specific files
by hpoussin＠svn.reactos.org 15 Mar '07

15 Mar '07

Author: hpoussin Date: Thu Mar 15 18:42:11 2007 New Revision: 26107 URL: http://svn.reactos.org/svn/reactos?rev=26107&view=rev Log: Split intrin.h file into architecture specific files Added: trunk/reactos/include/psdk/intrin_x86.h - copied, changed from r26103, trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Thu Mar 15 18:42:11 2007 @@ -69,889 +69,15 @@ would use in the same case */ -#ifdef __i386__ - -/*** Stack frame juggling ***/ -#define _ReturnAddress() (__builtin_return_address(0)) -#define _AddressOfReturnAddress() (&(((void **)(__builtin_frame_address(0)))[1])) -/* TODO: __getcallerseflags but how??? */ - - -/*** Atomic operations ***/ - -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 -#define _ReadWriteBarrier() __sync_synchronize() +#if defined(__i386__) +#include "intrin_x86.h" +#elif defined(_PPC_) +#include "intrin_ppc.h" +#elif defined(_MIPS_) +#include "intrin_mips.h" #else -static void __inline__ __attribute__((always_inline)) _MemoryBarrier(void) -{ - __asm__ __volatile__("" : : : "memory"); -} -#define _ReadWriteBarrier() _MemoryBarrier() -#endif - -/* BUGBUG: GCC only supports full barriers */ -#define _ReadBarrier _ReadWriteBarrier -#define _WriteBarrier _ReadWriteBarrier - -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 - -static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const Target, const long Value) -{ - /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) -{ - /* NOTE: ditto */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) -{ - return __sync_fetch_and_add(Addend, Value); -} - -static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_and(value, mask); -} - -static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_and(value, mask); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * const value, const long mask) -{ - return __sync_fetch_and_and(value, mask); -} - -static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_or(value, mask); -} - -static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_or(value, mask); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * const value, const long mask) -{ - return __sync_fetch_and_or(value, mask); -} - -static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedXor(volatile long * const value, const long mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -#else - -static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) -{ - char retval = Comperand; - __asm__("lock; cmpxchgb %b[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) -{ - short retval = Comperand; - __asm__("lock; cmpxchgw %w[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) -{ - long retval = Comperand; - __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) -{ - long long retval = Comperand; - - __asm__ - ( - "cmpxchg8b %[Destination]" : - [retval] "+A" (retval) : - [Destination] "m" (*Destination), - "b" ((unsigned long)((Exchange >> 0) & 0xFFFFFFFF)), - "c" ((unsigned long)((Exchange >> 32) & 0xFFFFFFFF)) : - "memory" - ); - - return retval; -} - -static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) -{ - void * retval = (void *)Comperand; - __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "=a" (retval) : "[retval]" (retval), [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const Target, const long Value) -{ - long retval = Value; - __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) -{ - void * retval = Value; - __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) -{ - long retval = Value; - __asm__("lock; xaddl %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) -{ - char x; - char y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange8(value, x & mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) -{ - short x; - short y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange16(value, x & mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * const value, const long mask) -{ - long x; - long y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange(value, x & mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) -{ - char x; - char y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange8(value, x | mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) -{ - short x; - short y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange16(value, x | mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * const value, const long mask) -{ - long x; - long y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange(value, x | mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) -{ - char x; - char y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange8(value, x ^ mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * const value, const short mask) -{ - short x; - short y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange16(value, x ^ mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedXor(volatile long * const value, const long mask) -{ - long x; - long y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange(value, x ^ mask, x); - } - while(y != x); - - return y; -} - -#endif - -static __inline__ __attribute__((always_inline)) long _InterlockedAddLargeStatistic(volatile long long * const Addend, const long Value) -{ - __asm__ - ( - "lock; add %[Value], %[Lo32];" - "jae LABEL%=;" - "lock; adc $0, %[Hi32];" - "LABEL%=:;" : - [Lo32] "=m" (*((volatile long *)(Addend) + 0)), [Hi32] "=m" (*((volatile long *)(Addend) + 1)) : - [Value] "ir" (Value) - ); - - return Value; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, -1) - 1; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedIncrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, 1) + 1; -} - -static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset(volatile long * a, const long b) -{ - unsigned char retval; - __asm__("lock; btrl %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "=m" (a) : [b] "Ir" (b) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset(volatile long * a, const long b) -{ - unsigned char retval; - __asm__("lock; btsl %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "=m" (a) : [b] "Ir" (b) : "memory"); - return retval; -} - - -/*** String operations ***/ -/* NOTE: we don't set a memory clobber in the __stosX functions because Visual C++ doesn't */ -static __inline__ __attribute__((always_inline)) void __stosb(unsigned char * Dest, const unsigned char Data, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; stosb" : - [Dest] "=D" (Dest), [Count] "=c" (Count) : - "[Dest]" (Dest), "a" (Data), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __stosw(unsigned short * Dest, const unsigned short Data, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; stosw" : - [Dest] "=D" (Dest), [Count] "=c" (Count) : - "[Dest]" (Dest), "a" (Data), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __stosd(unsigned long * Dest, const unsigned long Data, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; stosl" : - [Dest] "=D" (Dest), [Count] "=c" (Count) : - "[Dest]" (Dest), "a" (Data), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __movsb(unsigned char * Destination, const unsigned char * Source, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; movsb" : - [Destination] "=D" (Destination), [Source] "=S" (Source), [Count] "=c" (Count) : - "[Destination]" (Destination), "[Source]" (Source), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __movsw(unsigned short * Destination, const unsigned short * Source, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; movsw" : - [Destination] "=D" (Destination), [Source] "=S" (Source), [Count] "=c" (Count) : - "[Destination]" (Destination), "[Source]" (Source), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __movsd(unsigned long * Destination, const unsigned long * Source, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; movsd" : - [Destination] "=D" (Destination), [Source] "=S" (Source), [Count] "=c" (Count) : - "[Destination]" (Destination), "[Source]" (Source), "[Count]" (Count) - ); -} - - -/*** FS segment addressing ***/ -static __inline__ __attribute__((always_inline)) void __writefsbyte(const unsigned long Offset, const unsigned char Data) -{ - __asm__("movb %b[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __writefsword(const unsigned long Offset, const unsigned short Data) -{ - __asm__("movw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __writefsdword(const unsigned long Offset, const unsigned long Data) -{ - __asm__("movl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); -} - -static __inline__ __attribute__((always_inline)) unsigned char __readfsbyte(const unsigned long Offset) -{ - unsigned char value; - __asm__("movb %%fs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned short __readfsword(const unsigned long Offset) -{ - unsigned short value; - __asm__("movw %%fs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned long __readfsdword(const unsigned long Offset) -{ - unsigned long value; - __asm__("movl %%fs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); - return value; -} - -static __inline__ __attribute__((always_inline)) void __incfsbyte(const unsigned long Offset) -{ - __asm__("incb %%fs:%a[Offset]" : : [Offset] "ir" (Offset)); -} - -static __inline__ __attribute__((always_inline)) void __incfsword(const unsigned long Offset) -{ - __asm__("incw %%fs:%a[Offset]" : : [Offset] "ir" (Offset)); -} - -static __inline__ __attribute__((always_inline)) void __incfsdword(const unsigned long Offset) -{ - __asm__("incl %%fs:%a[Offset]" : : [Offset] "ir" (Offset)); -} - -/* NOTE: the bizarre implementation of __addfsxxx mimics the broken Visual C++ behavior */ -static __inline__ __attribute__((always_inline)) void __addfsbyte(const unsigned long Offset, const unsigned char Data) -{ - if(!__builtin_constant_p(Offset)) - __asm__("addb %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset)); - else - __asm__("addb %b[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __addfsword(const unsigned long Offset, const unsigned short Data) -{ - if(!__builtin_constant_p(Offset)) - __asm__("addw %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset)); - else - __asm__("addw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __addfsdword(const unsigned long Offset, const unsigned int Data) -{ - if(!__builtin_constant_p(Offset)) - __asm__("addl %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset)); - else - __asm__("addl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); -} - - -/*** Bit manipulation ***/ -static __inline__ __attribute__((always_inline)) unsigned char _BitScanForward(unsigned long * const Index, const unsigned long Mask) -{ - __asm__("bsfl %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); - return Mask ? 1 : 0; -} - -static __inline__ __attribute__((always_inline)) unsigned char _BitScanReverse(unsigned long * const Index, const unsigned long Mask) -{ - __asm__("bsrl %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); - return Mask ? 1 : 0; -} - -/* NOTE: again, the bizarre implementation follows Visual C++ */ -static __inline__ __attribute__((always_inline)) unsigned char _bittest(const long * const a, const long b) -{ - unsigned char retval; - - if(__builtin_constant_p(b)) - __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32)); - else - __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _bittestandcomplement(long * const a, const long b) -{ - unsigned char retval; - - if(__builtin_constant_p(b)) - __asm__("btc %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32)); - else - __asm__("btc %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _bittestandreset(long * const a, const long b) -{ - unsigned char retval; - - if(__builtin_constant_p(b)) - __asm__("btr %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32)); - else - __asm__("btr %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _bittestandset(long * const a, const long b) -{ - unsigned char retval; - - if(__builtin_constant_p(b)) - __asm__("bts %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32)); - else - __asm__("bts %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _rotl8(const unsigned char value, const unsigned char shift) -{ - unsigned char retval; - __asm__("rolb %b[shift], %b[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned short _rotl16(const unsigned short value, const unsigned char shift) -{ - unsigned short retval; - __asm__("rolw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _rotr8(const unsigned char value, const unsigned char shift) -{ - unsigned char retval; - __asm__("rorb %b[shift], %b[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned short _rotr16(const unsigned short value, const unsigned char shift) -{ - unsigned short retval; - __asm__("rorw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -/* - NOTE: in __ll_lshift, __ll_rshift and __ull_rshift we use the "A" - constraint (edx:eax) for the Mask argument, because it's the only way GCC - can pass 64-bit operands around - passing the two 32 bit parts separately - just confuses it. Also we declare Bit as an int and then truncate it to - match Visual C++ behavior -*/ -static __inline__ __attribute__((always_inline)) unsigned long long __ll_lshift(const unsigned long long Mask, const int Bit) -{ - unsigned long long retval = Mask; - - __asm__ - ( - "shldl %b[Bit], %%eax, %%edx; sall %b[Bit], %%eax" : - "+A" (retval) : - [Bit] "Nc" ((unsigned char)((unsigned long)Bit) & 0xFF) - ); - - return retval; -} - -static __inline__ __attribute__((always_inline)) long long __ll_rshift(const long long Mask, const int Bit) -{ - unsigned long long retval = Mask; - - __asm__ - ( - "shldl %b[Bit], %%eax, %%edx; sarl %b[Bit], %%eax" : - "+A" (retval) : - [Bit] "Nc" ((unsigned char)((unsigned long)Bit) & 0xFF) - ); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned long long __ull_rshift(const unsigned long long Mask, int Bit) -{ - unsigned long long retval = Mask; - - __asm__ - ( - "shrdl %b[Bit], %%eax, %%edx; shrl %b[Bit], %%eax" : - "+A" (retval) : - [Bit] "Nc" ((unsigned char)((unsigned long)Bit) & 0xFF) - ); - - return retval; -} - - -/*** 64-bit math ***/ -static __inline__ __attribute__((always_inline)) long long __emul(const int a, const int b) -{ - long long retval; - __asm__("imull %[b]" : "=A" (retval) : [a] "a" (a), [b] "rm" (b)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned long long __emulu(const unsigned int a, const unsigned int b) -{ - unsigned long long retval; - __asm__("mull %[b]" : "=A" (retval) : [a] "a" (a), [b] "rm" (b)); - return retval; -} - - -/*** Port I/O ***/ -static __inline__ __attribute__((always_inline)) unsigned char __inbyte(const unsigned short Port) -{ - unsigned char byte; - __asm__ __volatile__("inb %w[Port], %b[byte]" : [byte] "=a" (byte) : [Port] "Nd" (Port)); - return byte; -} - -static __inline__ __attribute__((always_inline)) unsigned short __inword(const unsigned short Port) -{ - unsigned short word; - __asm__ __volatile__("inw %w[Port], %w[word]" : [word] "=a" (word) : [Port] "Nd" (Port)); - return word; -} - -static __inline__ __attribute__((always_inline)) unsigned long __indword(const unsigned short Port) -{ - unsigned long dword; - __asm__ __volatile__("inl %w[Port], %k[dword]" : [dword] "=a" (dword) : [Port] "Nd" (Port)); - return dword; -} - -static __inline__ __attribute__((always_inline)) void __inbytestring(unsigned short Port, unsigned char * Buffer, unsigned long Count) -{ - __asm__ __volatile__ - ( - "rep; insb" : - [Buffer] "=D" (Buffer), [Count] "=c" (Count) : - "d" (Port), "[Buffer]" (Buffer), "[Count]" (Count) : - "memory" - ); -} - -static __inline__ __attribute__((always_inline)) void __inwordstring(unsigned short Port, unsigned short * Buffer, unsigned long Count) -{ - __asm__ __volatile__ - ( - "rep; insw" : - [Buffer] "=D" (Buffer), [Count] "=c" (Count) : - "d" (Port), "[Buffer]" (Buffer), "[Count]" (Count) : - "memory" - ); -} - -static __inline__ __attribute__((always_inline)) void __indwordstring(unsigned short Port, unsigned long * Buffer, unsigned long Count) -{ - __asm__ __volatile__ - ( - "rep; insl" : - [Buffer] "=D" (Buffer), [Count] "=c" (Count) : - "d" (Port), "[Buffer]" (Buffer), "[Count]" (Count) : - "memory" - ); -} - -static __inline__ __attribute__((always_inline)) void __outbyte(unsigned short const Port, const unsigned char Data) -{ - __asm__ __volatile__("outb %b[Data], %w[Port]" : : [Port] "Nd" (Port), [Data] "a" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __outword(unsigned short const Port, const unsigned short Data) -{ - __asm__ __volatile__("outw %w[Data], %w[Port]" : : [Port] "Nd" (Port), [Data] "a" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __outdword(unsigned short const Port, const unsigned long Data) -{ - __asm__ __volatile__("outl %k[Data], %w[Port]" : : [Port] "Nd" (Port), [Data] "a" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __outbytestring(unsigned short const Port, const unsigned char * const Buffer, const unsigned long Count) -{ - __asm__ __volatile__("rep; outsb" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); -} - -static __inline__ __attribute__((always_inline)) void __outwordstring(unsigned short const Port, const unsigned short * const Buffer, const unsigned long Count) -{ - __asm__ __volatile__("rep; outsw" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); -} - -static __inline__ __attribute__((always_inline)) void __outdwordstring(unsigned short const Port, const unsigned long * const Buffer, const unsigned long Count) -{ - __asm__ __volatile__("rep; outsl" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); -} - - -/*** System information ***/ -static __inline__ __attribute__((always_inline)) void __cpuid(int CPUInfo[], const int InfoType) -{ - __asm__ __volatile__("cpuid" : "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3]) : "a" (InfoType)); -} - -static __inline__ __attribute__((always_inline)) unsigned long long __rdtsc(void) -{ - unsigned long long retval; - __asm__ __volatile__("rdtsc" : "=A"(retval)); - return retval; -} - - -/*** Interrupts ***/ -static __inline__ __attribute__((always_inline)) void __debugbreak(void) -{ - __asm__("int $3"); -} - -static __inline__ __attribute__((always_inline)) void __int2c(void) -{ - __asm__("int $0x2c"); -} - -static __inline__ __attribute__((always_inline)) void _disable(void) -{ - __asm__("cli"); -} - -static __inline__ __attribute__((always_inline)) void _enable(void) -{ - __asm__("sti"); -} - - -/*** Protected memory management ***/ -static __inline__ __attribute__((always_inline)) unsigned long __readcr0(void) -{ - unsigned long value; - __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned long __readcr2(void) -{ - unsigned long value; - __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned long __readcr3(void) -{ - unsigned long value; - __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned long __readcr4(void) -{ - unsigned long value; - __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); - return value; -} - -static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) -{ - __asm__("mov %[Data], %%cr0" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) -{ - __asm__("mov %[Data], %%cr3" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) -{ - __asm__("mov %[Data], %%cr4" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __invlpg(void * const Address) -{ - __asm__("invlpg %[Address]" : : [Address] "m" (*((unsigned char *)(Address)))); -} - - -/*** System operations ***/ -static __inline__ __attribute__((always_inline)) unsigned long long __readmsr(const int reg) -{ - unsigned long long retval; - __asm__ __volatile__("rdmsr" : "=A" (retval) : "c" (reg)); - return retval; -} - -static __inline__ __attribute__((always_inline)) void __writemsr(const unsigned long Register, const unsigned long long Value) -{ - __asm__ __volatile__("wrmsr" : : "A" (Value), "c" (Register)); -} - -static __inline__ __attribute__((always_inline)) unsigned long long __readpmc(const int counter) -{ - unsigned long long retval; - __asm__ __volatile__("rdpmc" : "=A" (retval) : "c" (counter)); - return retval; -} - -/* NOTE: an immediate value for 'a' will raise an ICE in Visual C++ */ -static __inline__ __attribute__((always_inline)) unsigned long __segmentlimit(const unsigned long a) -{ - unsigned long retval; - __asm__ __volatile__("lsl %[a], %[retval]" : [retval] "=r" (retval) : [a] "rm" (a)); - return retval; -} - -static __inline__ __attribute__((always_inline)) void __wbinvd(void) -{ - __asm__ __volatile__("wbinvd"); -} - -#else -/* TODO: the x64 architecture shares most of the intrinsics. It should be easy to support */ -#warning Unsupported architecture +/* TODO: the x64 architecture shares most of the i386 intrinsics. It should be easy to support */ +#error Unsupported architecture #endif Copied: trunk/reactos/include/psdk/intrin_x86.h (from r26103, trunk/reactos/include/psdk/intrin.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin_x86.h Thu Mar 15 18:42:11 2007 @@ -1,5 +1,5 @@ /* - Compatibility <intrin.h> header for GCC -- GCC equivalents of intrinsic + Compatibility <intrin_x86.h> header for GCC -- GCC equivalents of intrinsic Microsoft Visual C++ functions. Originally developed for the ReactOS (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) projects. @@ -25,12 +25,8 @@ DEALINGS IN THE SOFTWARE. */ -#ifndef KJK_INTRIN_H_ -#define KJK_INTRIN_H_ - -#ifndef __GNUC__ -#error Unsupported compiler -#endif +#ifndef KJK_INTRIN_X86_H_ +#define KJK_INTRIN_X86_H_ /* FIXME: review all "memory" clobbers, add/remove to match Visual C++ @@ -68,8 +64,6 @@ Pay attention to the type of barrier. Make it match with what Visual C++ would use in the same case */ - -#ifdef __i386__ /*** Stack frame juggling ***/ #define _ReturnAddress() (__builtin_return_address(0)) @@ -949,18 +943,4 @@ __asm__ __volatile__("wbinvd"); } -#else -/* TODO: the x64 architecture shares most of the intrinsics. It should be easy to support */ -#warning Unsupported architecture -#endif - - -/*** Miscellaneous ***/ -/* BUGBUG: only good for use in macros. Cannot be taken the address of */ -#define __noop(...) ((void)0) - -/* TODO: __assume. GCC only supports the weaker __builtin_expect */ - -#endif - /* EOF */

1 0

[hpoussin] 26106: Add some missing files. Trunk is still not buildable
by hpoussin＠svn.reactos.org 15 Mar '07

15 Mar '07

Author: hpoussin Date: Thu Mar 15 13:58:19 2007 New Revision: 26106 URL: http://svn.reactos.org/svn/reactos?rev=26106&view=rev Log: Add some missing files. Trunk is still not buildable Added: trunk/reactos/lib/sdk/crt/include/internal/tcscat.h - copied unchanged from r26094, trunk/reactos/lib/string/tcscat.h trunk/reactos/lib/sdk/crt/include/internal/tcschr.h - copied unchanged from r26094, trunk/reactos/lib/string/tcschr.h trunk/reactos/lib/sdk/crt/include/internal/tcscmp.h - copied unchanged from r26094, trunk/reactos/lib/string/tcscmp.h trunk/reactos/lib/sdk/crt/include/internal/tcscpy.h - copied unchanged from r26094, trunk/reactos/lib/string/tcscpy.h trunk/reactos/lib/sdk/crt/include/internal/tcslen.h - copied unchanged from r26094, trunk/reactos/lib/string/tcslen.h trunk/reactos/lib/sdk/crt/include/internal/tcsncat.h - copied unchanged from r26094, trunk/reactos/lib/string/tcsncat.h trunk/reactos/lib/sdk/crt/include/internal/tcsncmp.h - copied unchanged from r26094, trunk/reactos/lib/string/tcsncmp.h trunk/reactos/lib/sdk/crt/include/internal/tcsncpy.h - copied unchanged from r26094, trunk/reactos/lib/string/tcsncpy.h trunk/reactos/lib/sdk/crt/include/internal/tcsnlen.h - copied unchanged from r26094, trunk/reactos/lib/string/tcsnlen.h trunk/reactos/lib/sdk/crt/include/internal/tcsrchr.h - copied unchanged from r26094, trunk/reactos/lib/string/tcsrchr.h trunk/reactos/lib/sdk/crt/string/i386/ - copied from r26094, trunk/reactos/lib/string/i386/ trunk/reactos/lib/sdk/crt/string/memchr.c - copied unchanged from r26094, trunk/reactos/lib/string/memchr.c trunk/reactos/lib/sdk/crt/string/memcmp.c - copied unchanged from r26094, trunk/reactos/lib/string/memcmp.c trunk/reactos/lib/sdk/crt/string/memcpy.c - copied unchanged from r26094, trunk/reactos/lib/string/memcpy.c trunk/reactos/lib/sdk/crt/string/memmove.c - copied unchanged from r26094, trunk/reactos/lib/string/memmove.c trunk/reactos/lib/sdk/crt/string/memset.c - copied unchanged from r26094, trunk/reactos/lib/string/memset.c trunk/reactos/lib/sdk/crt/string/strcat.c - copied, changed from r26094, trunk/reactos/lib/string/strcat.c trunk/reactos/lib/sdk/crt/string/strchr.c - copied, changed from r26094, trunk/reactos/lib/string/strchr.c trunk/reactos/lib/sdk/crt/string/strcmp.c - copied, changed from r26094, trunk/reactos/lib/string/strcmp.c trunk/reactos/lib/sdk/crt/string/strcpy.c - copied, changed from r26094, trunk/reactos/lib/string/strcpy.c trunk/reactos/lib/sdk/crt/string/strlen.c - copied, changed from r26094, trunk/reactos/lib/string/strlen.c trunk/reactos/lib/sdk/crt/string/strncat.c - copied, changed from r26094, trunk/reactos/lib/string/strncat.c trunk/reactos/lib/sdk/crt/string/strncmp.c - copied, changed from r26094, trunk/reactos/lib/string/strncmp.c trunk/reactos/lib/sdk/crt/string/strncpy.c - copied, changed from r26094, trunk/reactos/lib/string/strncpy.c trunk/reactos/lib/sdk/crt/string/strnlen.c - copied, changed from r26094, trunk/reactos/lib/string/strnlen.c trunk/reactos/lib/sdk/crt/string/strpbrk.c - copied unchanged from r26094, trunk/reactos/lib/string/strpbrk.c trunk/reactos/lib/sdk/crt/string/strrchr.c - copied, changed from r26094, trunk/reactos/lib/string/strrchr.c trunk/reactos/lib/sdk/crt/string/wcscat.c - copied, changed from r26094, trunk/reactos/lib/string/wcscat.c trunk/reactos/lib/sdk/crt/string/wcschr.c - copied, changed from r26094, trunk/reactos/lib/string/wcschr.c trunk/reactos/lib/sdk/crt/string/wcscmp.c - copied, changed from r26094, trunk/reactos/lib/string/wcscmp.c trunk/reactos/lib/sdk/crt/string/wcscpy.c - copied, changed from r26094, trunk/reactos/lib/string/wcscpy.c trunk/reactos/lib/sdk/crt/string/wcslen.c - copied, changed from r26094, trunk/reactos/lib/string/wcslen.c trunk/reactos/lib/sdk/crt/string/wcsncat.c - copied, changed from r26094, trunk/reactos/lib/string/wcsncat.c trunk/reactos/lib/sdk/crt/string/wcsncmp.c - copied, changed from r26094, trunk/reactos/lib/string/wcsncmp.c trunk/reactos/lib/sdk/crt/string/wcsncpy.c - copied, changed from r26094, trunk/reactos/lib/string/wcsncpy.c trunk/reactos/lib/sdk/crt/string/wcsnlen.c - copied, changed from r26094, trunk/reactos/lib/string/wcsnlen.c trunk/reactos/lib/sdk/crt/string/wcsrchr.c - copied, changed from r26094, trunk/reactos/lib/string/wcsrchr.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild Thu Mar 15 13:58:19 2007 @@ -45,16 +45,16 @@ <file>abnorter.c</file> <file>exhand2.c</file> <file>matherr.c</file> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>seh.s</file> - <file>unwind.c</file> - </directory> - </if> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>seh.s</file> + <file>unwind.c</file> + </directory> + </if> <file>xcptfil.c</file> </directory> <directory name="float"> - <file>chgsign.c</file> + <file>chgsign.c</file> <file>copysign.c</file> <file>fpclass.c</file> <file>fpecode.c</file> @@ -62,15 +62,14 @@ <file>isnan.c</file> <file>nafter.c</file> <file>scalb.c</file> - - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>clearfp.c</file> - <file>cntrlfp.c</file> - <file>logb.c</file> - <file>statfp.c</file> - </directory> - </if> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>clearfp.c</file> + <file>cntrlfp.c</file> + <file>logb.c</file> + <file>statfp.c</file> + </directory> + </if> </directory> <directory name="io"> <file>access.c</file> @@ -118,35 +117,35 @@ <directory name="math"> <file>acos.c</file> <file>adjust.c</file> - <file>asin.c</file> + <file>asin.c</file> <file>cabs.c</file> - <file>cosh.c</file> + <file>cosh.c</file> <file>frexp.c</file> <file>huge_val.c</file> <file>hypot.c</file> <file>j0_y0.c</file> <file>j1_y1.c</file> - <file>jn_yn.c</file> - <file>modf.c</file> + <file>jn_yn.c</file> + <file>modf.c</file> <file>s_modf.c</file> <file>sinh.c</file> <file>stubs.c</file> <file>tanh.c</file> - <file>pow_asm.c</file> + <file>pow_asm.c</file> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>atan2.c</file> - <file>exp.c</file> - <file>fmod.c</file> - <file>ldexp.c</file> - <file>atan_asm.s</file> - <file>pow_asm.s</file> - <file>log10_asm.s</file> - </directory> - </if> - <ifnot property="ARCH" value="i386"> - </ifnot> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>atan2.c</file> + <file>exp.c</file> + <file>fmod.c</file> + <file>ldexp.c</file> + <file>atan_asm.s</file> + <file>pow_asm.s</file> + <file>log10_asm.s</file> + </directory> + </if> + <ifnot property="ARCH" value="i386"> + </ifnot> </directory> <directory name="mbstring"> @@ -233,15 +232,13 @@ <file>lfind.c</file> <file>lsearch.c</file> </directory> - <directory name="setjmp"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>setjmp.s</file> - </directory> - </if> - </directory> - + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>setjmp.s</file> + </directory> + </if> + </directory> <directory name="signal"> <file>signal.c</file> <file>xcptinfo.c</file> @@ -357,11 +354,71 @@ <file>wmakpath.c</file> </directory> <directory name="string"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>memchr_asm.s</file> + <file>memcpy_asm.s</file> + <file>memmove_asm.s</file> + <file>memset_asm.s</file> + <file>strcat_asm.s</file> + <file>strchr_asm.s</file> + <file>strcmp_asm.s</file> + <file>strcpy_asm.s</file> + <file>strlen_asm.s</file> + <file>strncat_asm.s</file> + <file>strncmp_asm.s</file> + <file>strncpy_asm.s</file> + <file>strnlen_asm.s</file> + <file>strrchr_asm.s</file> + <file>wcscat_asm.s</file> + <file>wcschr_asm.s</file> + <file>wcscmp_asm.s</file> + <file>wcscpy_asm.s</file> + <file>wcslen_asm.s</file> + <file>wcsncat_asm.s</file> + <file>wcsncmp_asm.s</file> + <file>wcsncpy_asm.s</file> + <file>wcsnlen_asm.s</file> + <file>wcsrchr_asm.s</file> + </directory> + </if> + <ifnot property="ARCH" value="i386"> + <file>memchr.c</file> + <file>memcpy.c</file> + <file>memmove.c</file> + <file>memset.c</file> + <file>strcat.c</file> + <file>strchr.c</file> + <file>strcmp.c</file> + <file>strcpy.c</file> + <file>strlen.c</file> + <file>strncat.c</file> + <file>strncmp.c</file> + <file>strncpy.c</file> + <file>strnlen.c</file> + <file>strrchr.c</file> + <file>wcscat.c</file> + <file>wcschr.c</file> + <file>wcscmp.c</file> + <file>wcscpy.c</file> + <file>wcslen.c</file> + <file>wcsncat.c</file> + <file>wcsncmp.c</file> + <file>wcsncpy.c</file> + <file>wcsnlen.c</file> + <file>wcsrchr.c</file> + </ifnot> <file>lasttok.c</file> + <file>memcmp.c</file> + <file>memicmp.c</file> <file>strcoll.c</file> <file>strdup.c</file> <file>strerror.c</file> + <file>stricmp.c</file> + <file>strlwr.c</file> <file>strncoll.c</file> + <file>strnicmp.c</file> + <file>strpbrk.c</file> <file>strrev.c</file> <file>strset.c</file> <file>strstr.c</file> Copied: trunk/reactos/lib/sdk/crt/string/strcat.c (from r26094, trunk/reactos/lib/string/strcat.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strcat.… ============================================================================== --- trunk/reactos/lib/string/strcat.c (original) +++ trunk/reactos/lib/sdk/crt/string/strcat.c Thu Mar 15 13:58:19 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "tcscat.h" +#include "internal/tcscat.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/strchr.c (from r26094, trunk/reactos/lib/string/strchr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strchr.… ============================================================================== --- trunk/reactos/lib/string/strchr.c (original) +++ trunk/reactos/lib/sdk/crt/string/strchr.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _XINT int #include <string.h> -#include "tcschr.h" +#include "internal/tcschr.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/strcmp.c (from r26094, trunk/reactos/lib/string/strcmp.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strcmp.… ============================================================================== --- trunk/reactos/lib/string/strcmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/strcmp.c Thu Mar 15 13:58:19 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "tcscmp.h" +#include "internal/tcscmp.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/strcpy.c (from r26094, trunk/reactos/lib/string/strcpy.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strcpy.… ============================================================================== --- trunk/reactos/lib/string/strcpy.c (original) +++ trunk/reactos/lib/sdk/crt/string/strcpy.c Thu Mar 15 13:58:19 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "tcscpy.h" +#include "internal/tcscpy.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/strlen.c (from r26094, trunk/reactos/lib/string/strlen.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strlen.… ============================================================================== --- trunk/reactos/lib/string/strlen.c (original) +++ trunk/reactos/lib/sdk/crt/string/strlen.c Thu Mar 15 13:58:19 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "tcslen.h" +#include "internal/tcslen.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/strncat.c (from r26094, trunk/reactos/lib/string/strncat.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strncat… ============================================================================== --- trunk/reactos/lib/string/strncat.c (original) +++ trunk/reactos/lib/sdk/crt/string/strncat.c Thu Mar 15 13:58:19 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "tcsncat.h" +#include "internal/tcsncat.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/strncmp.c (from r26094, trunk/reactos/lib/string/strncmp.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strncmp… ============================================================================== --- trunk/reactos/lib/string/strncmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/strncmp.c Thu Mar 15 13:58:19 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "tcsncmp.h" +#include "internal/tcsncmp.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/strncpy.c (from r26094, trunk/reactos/lib/string/strncpy.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strncpy… ============================================================================== --- trunk/reactos/lib/string/strncpy.c (original) +++ trunk/reactos/lib/sdk/crt/string/strncpy.c Thu Mar 15 13:58:19 2007 @@ -1,6 +1,6 @@ /* $Id$ */ #include <string.h> -#include "tcsncpy.h" +#include "internal/tcsncpy.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/strnlen.c (from r26094, trunk/reactos/lib/string/strnlen.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strnlen… ============================================================================== --- trunk/reactos/lib/string/strnlen.c (original) +++ trunk/reactos/lib/sdk/crt/string/strnlen.c Thu Mar 15 13:58:19 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "tcsnlen.h" +#include "internal/tcsnlen.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/strrchr.c (from r26094, trunk/reactos/lib/string/strrchr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strrchr… ============================================================================== --- trunk/reactos/lib/string/strrchr.c (original) +++ trunk/reactos/lib/sdk/crt/string/strrchr.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _XINT int #include <string.h> -#include "tcsrchr.h" +#include "internal/tcsrchr.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcscat.c (from r26094, trunk/reactos/lib/string/wcscat.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcscat.… ============================================================================== --- trunk/reactos/lib/string/wcscat.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcscat.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "tcscat.h" +#include "internal/tcscat.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcschr.c (from r26094, trunk/reactos/lib/string/wcschr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcschr.… ============================================================================== --- trunk/reactos/lib/string/wcschr.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcschr.c Thu Mar 15 13:58:19 2007 @@ -4,6 +4,6 @@ #define _UNICODE #define _XINT wchar_t #include <wchar.h> -#include "tcschr.h" +#include "internal/tcschr.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcscmp.c (from r26094, trunk/reactos/lib/string/wcscmp.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcscmp.… ============================================================================== --- trunk/reactos/lib/string/wcscmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcscmp.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "tcscmp.h" +#include "internal/tcscmp.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcscpy.c (from r26094, trunk/reactos/lib/string/wcscpy.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcscpy.… ============================================================================== --- trunk/reactos/lib/string/wcscpy.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcscpy.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "tcscpy.h" +#include "internal/tcscpy.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcslen.c (from r26094, trunk/reactos/lib/string/wcslen.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcslen.… ============================================================================== --- trunk/reactos/lib/string/wcslen.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcslen.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "tcslen.h" +#include "internal/tcslen.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcsncat.c (from r26094, trunk/reactos/lib/string/wcsncat.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsncat… ============================================================================== --- trunk/reactos/lib/string/wcsncat.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsncat.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "tcsncat.h" +#include "internal/tcsncat.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcsncmp.c (from r26094, trunk/reactos/lib/string/wcsncmp.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsncmp… ============================================================================== --- trunk/reactos/lib/string/wcsncmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsncmp.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "tcsncmp.h" +#include "internal/tcsncmp.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcsncpy.c (from r26094, trunk/reactos/lib/string/wcsncpy.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsncpy… ============================================================================== --- trunk/reactos/lib/string/wcsncpy.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsncpy.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "tcsncpy.h" +#include "internal/tcsncpy.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcsnlen.c (from r26094, trunk/reactos/lib/string/wcsnlen.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsnlen… ============================================================================== --- trunk/reactos/lib/string/wcsnlen.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsnlen.c Thu Mar 15 13:58:19 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "tcsnlen.h" +#include "internal/tcsnlen.h" /* EOF */ Copied: trunk/reactos/lib/sdk/crt/string/wcsrchr.c (from r26094, trunk/reactos/lib/string/wcsrchr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsrchr… ============================================================================== --- trunk/reactos/lib/string/wcsrchr.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsrchr.c Thu Mar 15 13:58:19 2007 @@ -4,6 +4,6 @@ #define _UNICODE #define _XINT wchar_t #include <wchar.h> -#include "tcsrchr.h" +#include "internal/tcsrchr.h" /* EOF */

1 0

[fireball] 26105: - "Fix" RtlQueryRegistryValues() usage (inspired by 26072) - Typo fix - DPRINT added for showing RegistryPath
by fireball＠svn.reactos.org 15 Mar '07

15 Mar '07

Author: fireball Date: Thu Mar 15 13:37:58 2007 New Revision: 26105 URL: http://svn.reactos.org/svn/reactos?rev=26105&view=rev Log: - "Fix" RtlQueryRegistryValues() usage (inspired by 26072) - Typo fix - DPRINT added for showing RegistryPath Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Thu Mar 15 13:37:58 2007 @@ -654,6 +654,7 @@ } RtlCopyUnicodeString(&DriverExtension->RegistryPath, RegistryPath); + DPRINT("RegistryPath: %wZ\n", &DriverExtension->RegistryPath); } else { @@ -662,7 +663,7 @@ } /* - * Copy the correct miniport initializtation data to the device extension. + * Copy the correct miniport initialization data to the device extension. */ RtlCopyMemory( @@ -825,7 +826,7 @@ IN PMINIPORT_GET_REGISTRY_ROUTINE GetRegistryRoutine, IN PVOID HwContext) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; QUERY_REGISTRY_CALLBACK_CONTEXT Context; PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; @@ -840,13 +841,6 @@ QueryTable[0].QueryRoutine = QueryRegistryCallback; QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED; QueryTable[0].Name = ParameterName; - QueryTable[0].EntryContext = NULL; - QueryTable[0].DefaultType = REG_NONE; - QueryTable[0].DefaultData = NULL; - QueryTable[0].DefaultLength = 0; - - QueryTable[1].QueryRoutine = NULL; - QueryTable[1].Name = NULL; if (!NT_SUCCESS(RtlQueryRegistryValues( RTL_REGISTRY_ABSOLUTE,

1 0

[hpoussin] 26104: Fix crt compilation
by hpoussin＠svn.reactos.org 15 Mar '07

15 Mar '07

Author: hpoussin Date: Thu Mar 15 12:14:59 2007 New Revision: 26104 URL: http://svn.reactos.org/svn/reactos?rev=26104&view=rev Log: Fix crt compilation Added: trunk/reactos/lib/sdk/crt/ctype/ trunk/reactos/lib/sdk/crt/ctype/ctype.c - copied unchanged from r26094, trunk/reactos/lib/string/ctype.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild Thu Mar 15 12:14:59 2007 @@ -11,8 +11,8 @@ <define name="_MSVCRT_LIB_" /> <define name="_MSVCRT_" /> <define name="_MT" /> - <define name="__NO_CTYPE_INLINES" /> - <pch>precomp.h</pch> + <define name="__NO_CTYPE_INLINES" /> + <pch>precomp.h</pch> <directory name="conio"> <file>cgets.c</file> <file>cprintf.c</file> @@ -22,6 +22,9 @@ <file>kbhit.c</file> <file>putch.c</file> <file>ungetch.c</file> + </directory> + <directory name="ctype"> + <file>ctype.c</file> </directory> <directory name="direct"> <file>chdir.c</file>

1 0

[silverblade] 26103: Yet more files I've been meaning to commit... (and again they're mostly incomplete)
by silverblade＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: silverblade Date: Thu Mar 15 00:31:31 2007 New Revision: 26103 URL: http://svn.reactos.org/svn/reactos?rev=26103&view=rev Log: Yet more files I've been meaning to commit... (and again they're mostly incomplete) Added: trunk/reactos/drivers/multimedia/sb16_ks/ trunk/reactos/drivers/multimedia/sb16_ks/adapter.cpp trunk/reactos/drivers/multimedia/sb16_ks/main.cpp trunk/reactos/drivers/multimedia/sb16_ks/sb16.h trunk/reactos/drivers/multimedia/sb16_ks/sb16.rbuild trunk/reactos/drivers/multimedia/sb16_ks/sb16_ks.def trunk/reactos/drivers/multimedia/sb16_ks/stdunk.cpp trunk/reactos/drivers/multimedia/sb16_nt4/ trunk/reactos/drivers/multimedia/sb16_nt4/control.c trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c trunk/reactos/drivers/multimedia/sb16_nt4/main.c trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild trunk/reactos/drivers/multimedia/sb16_nt4/sndblst.h trunk/reactos/drivers/multimedia/stdunk/ trunk/reactos/drivers/multimedia/stdunk/stdunk.c trunk/reactos/drivers/multimedia/stdunk/stdunk.cpp Added: trunk/reactos/drivers/multimedia/sb16_ks/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_ks… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_ks/adapter.cpp (added) +++ trunk/reactos/drivers/multimedia/sb16_ks/adapter.cpp Thu Mar 15 00:31:31 2007 @@ -1,0 +1,137 @@ +#include "sb16.h" + +class CAdapterSB16 : + public IAdapterSB16, + public IAdapterPowerManagement, + public CUnknown +{ + public : + DECLARE_STD_UNKNOWN(); + DEFINE_STD_CONSTRUCTOR(CAdapterSB16); + ~CAdapterSB16(); + + STDMETHODIMP_(NTSTATUS) Init( + IN PRESOURCELIST ResourceList, + IN PDEVICE_OBJECT DeviceObject); + + STDMETHODIMP_(PINTERRUPTSYNC) GetInterruptSync(void); + + STDMETHODIMP_(void) SetWaveMiniport( + IN PWAVEMINIPORTSB16 Miniport); + + STDMETHODIMP_(BYTE) Read(void); + + STDMETHODIMP_(BOOLEAN) Write( + IN BYTE Value); + + STDMETHODIMP_(NTSTATUS) Reset(void); + + STDMETHODIMP_(void) SetMixerValue( + IN BYTE Index, + IN BYTE Value); + + STDMETHODIMP_(BYTE) GetMixerValue( + IN BYTE Index); + + STDMETHODIMP_(void) ResetMixer(void); + + //IMP_IAdapterPowerManagement; +}; + + +NTSTATUS +NewAdapter( + OUT PUNKNOWN* Unknown, + IN REFCLSID, + IN PUNKNOWN UnknownOuter OPTIONAL, + IN POOL_TYPE PoolType) +{ + STD_CREATE_BODY_( CAdapterSB16, Unknown, UnknownOuter, PoolType, PADAPTERSB16 ); +} + + +NTSTATUS CAdapterSB16::Init( + IN PRESOURCELIST ResourceList, + IN PDEVICE_OBJECT DeviceObject) +{ + return STATUS_UNSUCCESSFUL; +} + +CAdapterSB16::~CAdapterSB16() +{ +} +/* +STDMETHODIMP +CAdapterSB16::NonDelegatingQueryInterface( + REFIID Interface, + PVOID* Object) +{ + return STATUS_UNSUCCESSFUL; +} +*/ +STDMETHODIMP_(PINTERRUPTSYNC) +CAdapterSB16::GetInterruptSync() +{ + return NULL; +} + +STDMETHODIMP_(BYTE) +CAdapterSB16::Read() +{ + return 0x00; +} + +STDMETHODIMP_(BOOLEAN) +CAdapterSB16::Write( + IN BYTE Value) +{ + return FALSE; +} + +STDMETHODIMP_(NTSTATUS) +CAdapterSB16::Reset() +{ + return STATUS_UNSUCCESSFUL; +} + +STDMETHODIMP_(void) +CAdapterSB16::SetMixerValue( + IN BYTE Index, + IN BYTE Value) +{ +} + +STDMETHODIMP_(BYTE) +CAdapterSB16::GetMixerValue( + IN BYTE Index) +{ + return 0x00; +} + +STDMETHODIMP_(void) +CAdapterSB16::ResetMixer() +{ +} + + +/* +STDMETHODIMP_(void) +CAdapterSB16::PowerChangeState( + IN POWER_STATE NewState) +{ +} + +STDMETHODIMP_(NTSTATUS) +CAdapterSB16::QueryPowerChangeState( + IN POWER_STATE NewStateQuery) +{ + return STATUS_UNSUCCESSFUL; +} + +STDMETHODIMP_(NTSTATUS) +CAdapterSB16::QueryDeviceCapabilities( + IN PDEVICE_CAPABILITIES) +{ + return STATUS_UNSUCCESSFUL; +} +*/ Added: trunk/reactos/drivers/multimedia/sb16_ks/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_ks… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_ks/main.cpp (added) +++ trunk/reactos/drivers/multimedia/sb16_ks/main.cpp Thu Mar 15 00:31:31 2007 @@ -1,0 +1,356 @@ +/* + ReactOS Operating System + Sound Blaster KS Driver + + AUTHORS: + Andrew Greenwood + + NOTES: + WaveTable is not supported. +*/ + +#include <sb16.h> + +/* How many miniports do we support? */ +#define MAX_MINIPORTS 1 + + +typedef struct +{ + PRESOURCELIST Wave; + PRESOURCELIST WaveTable; + PRESOURCELIST FmSynth; + PRESOURCELIST Uart; + PRESOURCELIST Adapter; +} Resources; + + +DWORD +DetectPlatform( + PPORTTOPOLOGY Port) +{ + /* ASSERT(Port); */ + + PPORTCLSVERSION portcls_version; + PDRMPORT drm_port; + PPORTEVENTS port_events; + DWORD version; + +/* + TODO: This stuff needs IID impls + + Port->QueryInterface( IID_IPortClsVersion, (PVOID*) &portcls_version); + Port->QueryInterface( IID_IDrmPort, (PVOID*) &drm_port); + Port->QueryInterface( IID_IPortEvents, (PVOID*) &port_events); +*/ + + if ( portcls_version ) + { + version = portcls_version->GetVersion(); + portcls_version->Release(); + } + + /* If we don't support portcls' GetVersion, we can try other methods */ + else if ( drm_port ) + { + version = kVersionWinME; + // ASSERT(IoIsWdmVersionAvailable(0x01, 0x05)); + } + + /* If portcls GetVersion and DRMPort not supported, it'll be Win98 */ + else if ( port_events ) + { + version = kVersionWin98SE; + } + + /* IPortEvents was added in Win 98 SE so if not supported, it's not 98 SE */ + else + { + version = kVersionWin98; + } + + return version; +} + + +NTSTATUS +DetectFeatures( + IN PRESOURCELIST ResourceList, + OUT PBOOLEAN HasUart, + OUT PBOOLEAN HasFmSynth, + OUT PBOOLEAN HasWaveTable) +{ + NTSTATUS status = STATUS_SUCCESS; + + BOOLEAN DetectedWaveTable = FALSE; + BOOLEAN DetectedUart = FALSE; + BOOLEAN DetectedFmSynth = FALSE; + + ULONG IoCount = ResourceList->NumberOfPorts(); + ULONG IrqCount = ResourceList->NumberOfInterrupts(); + ULONG DmaCount = ResourceList->NumberOfDmas(); + + switch ( IoCount ) + { + case 1 : /* No FM / UART */ + { + if ( ( ResourceList->FindTranslatedPort(0)->u.Port.Length < 16 ) || + ( IrqCount < 1 ) || + ( DmaCount < 1 ) ) + { + status = STATUS_DEVICE_CONFIGURATION_ERROR; + } + + break; + + case 2 : + { + if ( ( ResourceList->FindTranslatedPort(0)->u.Port.Length < 16 ) || + ( IrqCount < 1 ) || + ( DmaCount < 1 ) ) + { + status = STATUS_DEVICE_CONFIGURATION_ERROR; + } + + else + { + /* The length of the port indicates the function provided */ + + switch ( ResourceList->FindTranslatedPort(1)->u.Port.Length ) + { + case 2 : + { + DetectedUart = TRUE; + break; + } + case 4: + { + DetectedFmSynth = TRUE; + break; + } + default : + { + status = STATUS_DEVICE_CONFIGURATION_ERROR; + } + } + } + + break; + } + + case 3 : + { + if ( ( ResourceList->FindTranslatedPort(0)->u.Port.Length < 16 ) || + ( ResourceList->FindTranslatedPort(1)->u.Port.Length != 2 ) || + ( ResourceList->FindTranslatedPort(2)->u.Port.Length != 4 ) || + ( IrqCount < 1 ) || + ( DmaCount < 1 ) ) + { + status = STATUS_DEVICE_CONFIGURATION_ERROR; + } + else + { + DetectedUart = TRUE; + DetectedFmSynth = TRUE; + } + + break; + } + + default : + { + status = STATUS_DEVICE_CONFIGURATION_ERROR; + break; + } + } + + if ( HasUart ) + *HasUart = DetectedUart; + if ( HasFmSynth ) + *HasFmSynth = DetectedFmSynth; + if ( HasWaveTable ) + *HasWaveTable = DetectedWaveTable; + + return status; +} + + +NTSTATUS +AssignResources( + IN PRESOURCELIST ResourceList, + OUT Resources* Resources) +{ + NTSTATUS status; + BOOLEAN HasUart, HasFmSynth, HasWaveTable; + + Resources->Adapter = NULL; + Resources->Wave = NULL; + Resources->Uart = NULL; + Resources->FmSynth = NULL; + Resources->WaveTable = NULL; + + status = DetectFeatures(ResourceList, &HasUart, &HasFmSynth, &HasWaveTable); + + if ( ! NT_SUCCESS(status) ) + { + return status; + } + + /* Wave I/O resources */ + + status = PcNewResourceSublist(Resources->Wave, + NULL, + PagedPool, + ResourceList, + ResourceList->NumberOfDmas() + + ResourceList->NumberOfInterrupts + 1); + + if ( NT_SUCCESS(status) ) + { + ULONG i; + + /* Base port address */ + status = (*Resources->Wave)->AddPortFromParent(ResourceList, 0); + + /* DMA channels */ + if ( NT_SUCCESS(status) ) + { + for ( i = 0; i < ResourceList->NumberOfDmas(); i ++ ) + { + status = (*Resources->Wave)->AddDmaFromParent(ResourceList, i); + + if ( ! NT_SUCCESS(status) ) + break; + } + } + + /* IRQs */ + if ( NT_SUCCESS(status) ) + { + for ( i = 0; i < ResourceList->NumberOfInterrupts(); i ++ ) + { + status = (*Resources->Wave)->AddInterruptFromParent(ResourceList, i); + + if ( ! NT_SUCCESS(status) ) + break; + } + } + } + + /* UART resources */ + + if ( NT_SUCCESS(status) && HasUart ) + { + /* TODO */ + } + + /* FM Synth resources */ + + if ( NT_SUCCESS(status) && HasFmSynth ) + { + /* TODO */ + } + + /* Adapter resources */ + + if ( NT_SUCCESS(status) ) + { + status = PcNewResourceSublist(Resources->Adapter, + NULL, + PagedPool, + ResourceList, + 3); + + if ( NT_SUCCESS(status) ) + { + status = (*Resources->Adapter)->AddInterruptFromParent(ResourceList, 0); + } + + if ( NT_SUCCESS(status) ) + { + status = (*Resources->Adapter)->AddPortFromParent(ResourceList, 0); + } + + if ( NT_SUCCESS(status) && HasUart ) + { + /* TODO */ + } + } + + /* Cleanup - TODO: Make this cleanup UART, FM etc. */ + + if ( ! NT_SUCCESS(status) ) + { + if ( *Resources->Wave ) + { + (*Resources->Wave)->Release(); + *Resources->Wave = NULL; + } + + if ( *Resources->Adapter ) + { + (*Resources->Adapter)->Release(); + *Resources->Adapter = NULL; + } + } + + return status; +} + + +NTSTATUS +StartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PRESOURCELIST ResourceList) +{ + NTSTATUS status = STATUS_SUCCESS; + + Resources DeviceResources; + + PUNKNOWN UnknownTopology = NULL; + PUNKNOWN UnknownWave = NULL; + PUNKNOWN UnknownWaveTable = NUL; + PUNKNOWN UnknownFmSynth = NULL; + + PADAPTERCOMMON AdapterCommon = NULL; + PUNKNOWN UnknownCommon = NULL; + + status = AssignResources(ResourceList, &DeviceResources); + + if ( NT_SUCCESS(status) ) + { + } + + return status; +} + +extern "C" +NSTATUS +AddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + return PcAddAdapterDevice(DriverObject, + PhysicalDeviceObject, + StartDevice, + MAX_MINIPORTS, + 0); +} + +extern "C" +NTSTATUS +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName) +{ + NTSTATUS status; + + status = PcInitializeAdapterDriver(DriverObject, + RegistryPathName, + AddDevice); + + /* TODO: Add our own IRP handlers here */ + + return status; +} Added: trunk/reactos/drivers/multimedia/sb16_ks/sb16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_ks… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_ks/sb16.h (added) +++ trunk/reactos/drivers/multimedia/sb16_ks/sb16.h Thu Mar 15 00:31:31 2007 @@ -1,0 +1,141 @@ +/* + ReactOS Operating System + Sound Blaster KS Driver + + AUTHORS: + Andrew Greenwood + + NOTES: + Ah, the Sound Blaster 16. I remember it well... +*/ + +#include <portcls.h> +#include <stdunk.h> + +#ifndef SB16_H +#define SB16_H + +#define MAX_DMA_BUFFER_SIZE 65536 + +enum DspRegister +{ + DspRegCMSD0 = 0x00, + DspRegCMSR0 = 0x01, + DspRegCMSD1 = 0x02, + DspRegCMSR1 = 0x03, + DspRegMixerReg = 0x04, + DspRegMixerData = 0x05, + DspRegReset = 0x06, + DspRegFMD0 = 0x08, + DspRegFMR0 = 0x09, + DspRegRead = 0x0a, + DspRegWrite = 0x0c, + DspRegDataAvailable = 0x0e, + + DspRegAck8 = 0x0e, + DspRegAck16 = 0x0f +}; + +enum DspCommand +{ + DspWriteWaveProgrammedIo = 0x10, + DspWriteWave = 0x14, + DspWriteWaveAuto = 0x1c, + DspReadWave = 0x24, + DspReadWaveAuto = 0x2C, + DspWriteHighSpeedWave = 0x90, + DspReadHighSpeedWave = 0x98, + DspSetSampleRate = 0x40, + DspSetBlockSize = 0x48, + DspEnableOutput = 0xd1, + DspDisableOutput = 0xd3, + DspOutputStatus = 0xd8, + DspPauseDma = 0xd0, + DspContinueDma = 0xd4, + DspHaltAutoDma = 0xda, + DspInverter = 0xe0, + DspGetVersion = 0xe1, + DspGenerateInterrupt = 0xf2, + + /* SB16 only */ + DspSetDacRate = 0x41, + DspSetAdcRate = 0x42, + DspStartDac16 = 0xb6, + DspStartAdc16 = 0xbe, + DspStartDac8 = 0xc6, + DspStartAdc8 = 0xc3, + DspPauseDma16 = 0xd5, + DspContinueDma16 = 0xd6, + DspHaltAutoDma16 = 0xd9 +}; + +enum DspMixerRegister +{ + DspMixMasterVolumeLeft = 0x00, + DspMixMasterVolumeRight = 0x01, + DspMixVoiceVolumeLeft = 0x02, + DspMixVoiceVolumeRight = 0x03, + /* ... */ + DspMixIrqConfig = 0x80, + DspMixDmaConfig = 0x81 +}; + + +#define MPU401_OUTPUT_READY 0x40 +#define MPU401_INPUT_READY 0x80 + +#define MPU401_RESET 0xff +#define MPU401_UART_MODE 0x3f + +DEFINE_GUID(IID_IWaveMiniportSB16, + 0xbe23b2d7, 0xa760, 0x43ab, 0xb7, 0x6e, 0xbc, 0x3e, 0x93, 0xe6, 0xff, 0x54); + +DECLARE_INTERFACE_(IWaveMiniportSB16, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(void, RestoreSampleRate)( THIS ) PURE; + STDMETHOD_(void, ServiceWaveISR)( THIS ) PURE; +}; + +typedef IWaveMiniportSB16 *PWAVEMINIPORTSB16; + + +DEFINE_GUID(IID_IAdapterSB16, + 0xfba9052c, 0x0544, 0x4bc4, 0x97, 0x3f, 0x70, 0xb7, 0x06, 0x46, 0x81, 0xe5); + +DECLARE_INTERFACE_(IAdapterSB16, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(NTSTATUS, Init)( THIS_ + IN PRESOURCELIST ResourceList, + IN PDEVICE_OBJECT DeviceObject) PURE; + + STDMETHOD_(PINTERRUPTSYNC, GetInterruptSync)( THIS ) PURE; + + STDMETHOD_(void, SetWaveMiniport)( THIS_ + IN PWAVEMINIPORTSB16 Miniport) PURE; + + STDMETHOD_(BYTE, Read)( THIS ) PURE; + + STDMETHOD_(BOOLEAN, Write)( THIS_ + IN BYTE Value) PURE; + + STDMETHOD_(NTSTATUS, Reset)( THIS ) PURE; + + STDMETHOD_(void, SetMixerValue)( THIS_ + IN BYTE Index, + IN BYTE Value) PURE; + + STDMETHOD_(BYTE, GetMixerValue)( THIS_ + IN BYTE Index) PURE; + + STDMETHOD_(void, ResetMixer)( THIS ) PURE; + + /* TODO - Save/load settings */ +}; + +typedef IAdapterSB16 *PADAPTERSB16; + +#endif Added: trunk/reactos/drivers/multimedia/sb16_ks/sb16.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_ks… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_ks/sb16.rbuild (added) +++ trunk/reactos/drivers/multimedia/sb16_ks/sb16.rbuild Thu Mar 15 00:31:31 2007 @@ -1,0 +1,11 @@ +<module name="sb16_ks" type="exportdriver" installbase="system32/drivers" installname="sb16_ks.sys" allowwarnings="true"> + <include base="sb16_ks">.</include> + <include base="sb16_ks">..</include> + <importlibrary definition="sb16_ks.def" /> + <library>ntoskrnl</library> + <library>portcls</library> + <define name="__USE_W32API" /> + <file>stdunk.cpp</file> + <file>adapter.cpp</file> + <file>main.cpp</file> +</module> Added: trunk/reactos/drivers/multimedia/sb16_ks/sb16_ks.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_ks… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_ks/sb16_ks.def (added) +++ trunk/reactos/drivers/multimedia/sb16_ks/sb16_ks.def Thu Mar 15 00:31:31 2007 @@ -1,0 +1,6 @@ +; +; Exports definition file for sb16_ks.sys +; +EXPORTS +DriverEntry@8 + Added: trunk/reactos/drivers/multimedia/sb16_ks/stdunk.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_ks… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_ks/stdunk.cpp (added) +++ trunk/reactos/drivers/multimedia/sb16_ks/stdunk.cpp Thu Mar 15 00:31:31 2007 @@ -1,0 +1,68 @@ +/* + ReactOS Kernel-Mode COM + IUnknown implementations + + LICENSE + Please see COPYING in the top-level directory for license information. + + AUTHORS + Andrew Greenwood +*/ + +#include <stdunk.h> + +CUnknown::CUnknown(PUNKNOWN outer_unknown) +{ + m_ref_count = 0; + + if ( outer_unknown ) + m_outer_unknown = outer_unknown; + else + m_outer_unknown = PUNKNOWN(dynamic_cast<PNONDELEGATINGUNKNOWN>(this)); +} + +CUnknown::~CUnknown() +{ +} + +STDMETHODIMP_(ULONG) +CUnknown::NonDelegatingAddRef() +{ + InterlockedIncrement(&m_ref_count); + return m_ref_count; +} + +STDMETHODIMP_(ULONG) +CUnknown::NonDelegatingRelease() +{ + if ( InterlockedDecrement(&m_ref_count) == 0 ) + { + m_ref_count ++; + delete this; + return 0; + } + + return m_ref_count; +} + +STDMETHODIMP_(NTSTATUS) +CUnknown::NonDelegatingQueryInterface( + IN REFIID iid, + PVOID* ppVoid) +{ + /* FIXME */ + #if 0 + if ( IsEqualGUID(iid, IID_IUnknown) ) /* TODO: Aligned? */ + *ppVoid = PVOID(PUNKNOWN(this)); + else + *ppVoid = NULL; + #endif + + if ( *ppVoid ) + { + PUNKNOWN(*ppVoid)->AddRef(); + return STATUS_SUCCESS; + } + + return STATUS_INVALID_PARAMETER; +} Added: trunk/reactos/drivers/multimedia/sb16_nt4/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/control.c (added) +++ trunk/reactos/drivers/multimedia/sb16_nt4/control.c Thu Mar 15 00:31:31 2007 @@ -1,0 +1,222 @@ +#include <sndblst.h> + +/* + TODO: MmMapIoSpace() +*/ + +/* + This checks the read or write status port of the device. +*/ + +BOOLEAN +WaitForReady( + PSOUND_BLASTER_PARAMETERS SBDevice, + UCHAR Port) +{ + ULONG timeout = SB_TIMEOUT; + BOOL ready = FALSE; + + while ( ( ! ready ) && ( timeout > 0 ) ) + { + if ( SbRead(SBDevice, Port) & 0x80 ) + return TRUE; + + timeout --; + } + + return FALSE; +} + +BOOLEAN +SbWriteData( + PSOUND_BLASTER_PARAMETERS SBDevice, + UCHAR Data) +{ + if ( ! WaitToWrite(SBDevice) ) + return FALSE; + + DPRINT("Writing 0x%x to Sound Blaster card (data)\n", Data); + SbWrite(SBDevice, SB_WRITE_DATA_PORT, Data); + + return TRUE; +} + +BOOLEAN +SbReadData( + PSOUND_BLASTER_PARAMETERS SBDevice, + PUCHAR Data) +{ + if ( ! WaitToWrite(SBDevice) ) + return FALSE; + + *Data = SbRead(SBDevice, SB_READ_DATA_PORT); + DPRINT("Read 0x%x from Sound Blaster card (data)\n", *Data); + + return TRUE; +} + +BOOLEAN +ResetSoundBlaster( + PSOUND_BLASTER_PARAMETERS SBDevice) +{ + BOOLEAN acked = FALSE; + ULONG timeout; + + SbWriteReset(SBDevice, 0x01); + for (timeout = 0; timeout < 30000; timeout ++ ); + SbWriteReset(SBDevice, 0x00); + + DPRINT("Waiting for SB to acknowledge our reset request\n"); + + if ( ! WaitToRead(SBDevice) ) + { + DPRINT("Didn't get an ACK :(\n"); + return FALSE; + } + + timeout = 0; + + while ( ( ! acked ) && ( timeout < SB_TIMEOUT ) ) + { + acked = ( SbReadDataWithoutWait(SBDevice) == SB_DSP_READY ); + timeout ++; + } + + if ( ! acked ) + { + DPRINT("Didn't get an ACK :(\n"); + return FALSE; + } + + return TRUE; +} + +ULONG +GetSoundBlasterModel( + PSOUND_BLASTER_PARAMETERS SBDevice) +{ + UCHAR MajorVer, MinorVer; + + DPRINT("Querying DSP version\n"); + + if ( ! SbWriteData(SBDevice, SbGetDspVersion) ) + return NotDetected; + + if ( ! WaitToRead(SBDevice) ) + return NotDetected; + + if ( SbReadData(SBDevice, &MajorVer) ) + { + if ( SbReadData(SBDevice, &MinorVer) ) + { + DPRINT("Version %d.%d\n", MajorVer, MinorVer); + + SBDevice->dsp_version = (MajorVer * 256) + MinorVer; + + if ( SBDevice->dsp_version < 0x0200 ) + return SoundBlaster; + else if ( ( SBDevice->dsp_version & 0xFF00 ) == 0x0200 ) + return SoundBlaster2; + else if ( ( SBDevice->dsp_version & 0xFF00 ) == 0x0300 ) + return SoundBlasterPro; + else if ( SBDevice->dsp_version >= 0x0400 ) + return SoundBlaster16; + + return NotDetected; + } + } + + return NotDetected; +} + + +BOOLEAN +IsSampleRateCompatible( + PSOUND_BLASTER_PARAMETERS SBDevice, + ULONG SampleRate) +{ + /* TODO */ + return TRUE; +} + +BOOLEAN +SetOutputSampleRate( + PSOUND_BLASTER_PARAMETERS SBDevice, + ULONG SampleRate) +{ + /* Only works for DSP v4.xx */ + DPRINT("Setting sample rate\n"); + + SbWriteData(SBDevice, SbSetOutputRate); + SbWriteData(SBDevice, SampleRate / 256); + SbWriteData(SBDevice, SampleRate % 256); + + return TRUE; +} + +BOOLEAN +EnableSpeaker( + PSOUND_BLASTER_PARAMETERS SBDevice) +{ + DPRINT("Enabling speaker\n"); + + return SbWriteData(SBDevice, SbEnableSpeaker); +} + +BOOLEAN +DisableSpeaker( + PSOUND_BLASTER_PARAMETERS SBDevice) +{ + DPRINT("Disabling speaker\n"); + + return SbWriteData(SBDevice, SbDisableSpeaker); +} + +BOOLEAN +StartSoundOutput( + PSOUND_BLASTER_PARAMETERS SBDevice, + ULONG BitDepth, + ULONG Channels, + ULONG BlockSize) +{ + DPRINT("Initializing output with %d channels at %d bits/sample\n", Channels, BitDepth); + + UCHAR command = 0xc6, mode = 0x00; + + if ( ( Channels < 1 ) || ( Channels > 2 ) ) + return FALSE; + + if ( ( BitDepth != 8 ) && ( BitDepth != 16 ) ) + return FALSE; + + switch ( BitDepth ) + { + case 8 : command = 0xc6; break; + case 16 : command = 0xb6; break; + }; + + switch ( Channels ) + { + case 1 : mode = 0x00; break; + case 2 : mode = 0x20; break; + } +#if 0 + first_byte = (BitDepth == 16) ? 0xb6 : 0xc6; + second_byte = (Channels == 1) ? 0x20 : 0x00; +#endif + + if ( SBDevice->dsp_version < 0x0400 ) + { + /* TODO: Additional programming required */ + } + + /* Send freq */ + SbWriteData(SBDevice, command); + SbWriteData(SBDevice, mode); + SbWriteData(SBDevice, BlockSize % 256); + SbWriteData(SBDevice, BlockSize / 256); + + DPRINT("Finished programming the DSP\n"); + + return TRUE; +} Added: trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c (added) +++ trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c Thu Mar 15 00:31:31 2007 @@ -1,0 +1,61 @@ +/* +*/ + +#include <sndblst.h> + +BOOLEAN +CheckIrq( + PDEVICE_OBJECT DeviceObject) +{ +/* PSOUND_BLASTER_PARAMETERS parameters = DeviceObject->DriverExtension;*/ + + /* TODO */ + + return TRUE; +} + +BOOLEAN +ServiceSoundBlasterInterrupt( + IN PKINTERRUPT Interrupt, + IN PVOID Context) +{ + DPRINT("* Processing ISR *\n"); + return FALSE; +} + +NTSTATUS +EnableIrq( + PDEVICE_OBJECT DeviceObject) +{ + PSOUND_BLASTER_PARAMETERS parameters = DeviceObject->DeviceExtension; + ULONG vector; + KIRQL irq_level; + KAFFINITY affinity; + NTSTATUS status = STATUS_SUCCESS; + + vector = HalGetInterruptVector(Isa, + 0, + parameters->irq, + parameters->irq, + &irq_level, + &affinity); + + DPRINT("Vector is 0x%x\n", vector); + + status = IoConnectInterrupt(parameters->interrupt, + ServiceSoundBlasterInterrupt, + DeviceObject, + (PKSPIN_LOCK) NULL, + vector, + irq_level, + irq_level, + Latched, /* Latched / LevelSensitive */ + FALSE, /* shareable */ + affinity, + FALSE); + + if ( status == STATUS_INVALID_PARAMETER ) + status = STATUS_DEVICE_CONFIGURATION_ERROR; + + return status; +} Added: trunk/reactos/drivers/multimedia/sb16_nt4/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/main.c (added) +++ trunk/reactos/drivers/multimedia/sb16_nt4/main.c Thu Mar 15 00:31:31 2007 @@ -1,0 +1,489 @@ +/* + ReactOS + Sound Blaster driver + + Programmers: + Andrew Greenwood + + Notes: + Compatible with NT4 +*/ + +#include <sndblst.h> + + +/* + IRP DISPATCH ROUTINES +*/ + +NTSTATUS STDCALL +CreateSoundBlaster( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + + DPRINT("CreateSoundBlaster() called - extension 0x%x\n", sb_device); + + EnableSpeaker(sb_device); + /*SetOutputSampleRate(sb_device, 22*/ + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +CloseSoundBlaster( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + + DPRINT("CloseSoundBlaster() called\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +CleanupSoundBlaster( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + + DPRINT("CleanupSoundBlaster() called\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +ControlSoundBlaster( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION stack; + PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + + DPRINT("ControlSoundBlaster() called\n"); + + stack = IoGetCurrentIrpStackLocation(Irp); + + switch ( stack->Parameters.DeviceIoControl.IoControlCode) + { + /* TODO */ + }; + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +WriteSoundBlaster( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + + DPRINT("WriteSoundBlaster() called\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +VOID STDCALL +UnloadSoundBlaster( + PDRIVER_OBJECT DriverObject) +{ + DPRINT("Sound Blaster driver unload\n"); +} + +NTSTATUS STDCALL +OpenSubkey( + PUNICODE_STRING RegistryPath, + PWSTR Subkey, + ACCESS_MASK DesiredAccess, + OUT HANDLE* DevicesKeyHandle) +{ + NTSTATUS status; + OBJECT_ATTRIBUTES attribs; + UNICODE_STRING subkey_name; + HANDLE key_handle; + + /* TODO: Check for NULL ptr in DevicesKeyHandle */ + + InitializeObjectAttributes(&attribs, + RegistryPath, + OBJ_CASE_INSENSITIVE, + NULL, + (PSECURITY_DESCRIPTOR) NULL); + + status = ZwOpenKey(&key_handle, KEY_READ, &attribs); + + if ( ! NT_SUCCESS(status) ) + { + DPRINT("Couldn't open subkey %wZ\n", Subkey); + return status; + } + + RtlInitUnicodeString(&subkey_name, Subkey); + + InitializeObjectAttributes(&attribs, + &subkey_name, + OBJ_CASE_INSENSITIVE, + key_handle, + (PSECURITY_DESCRIPTOR) NULL); + + status = ZwOpenKey(*DevicesKeyHandle, DesiredAccess, &attribs); + ZwClose(key_handle); + + return status; +} + + +PWSTR STDCALL +AllocateRegistryPathInfo( + PUNICODE_STRING BasePath, + PUNICODE_STRING ParametersPath, + PKEY_BASIC_INFORMATION KeyInfo) +{ + PWSTR name; + PWSTR pos; + + DPRINT("Allocating memory for path info\n"); + name = ExAllocatePool(PagedPool, + BasePath->Length + sizeof(WCHAR) + + ParametersPath->Length + sizeof(WCHAR) + + KeyInfo->NameLength + sizeof(UNICODE_NULL)); + + if ( ! name ) + return NULL; + + DPRINT("Copying info\n"); + pos = name; + + RtlCopyMemory((PVOID)Pos, (PVOID)BasePath->Buffer, BasePath->Length); + pos += BasePath->Length / sizeof(WCHAR); + pos[0] = '\\'; + pos ++; + + RtlCopyMemory((PVOID)Pos, (PVOID)ParametersPath->Buffer, ParametersPath->Length); + pos += ParametersPath->Length / sizeof(WCHAR); + pos[0] = '\\'; + pos ++; + + RtlCopyMemory((PVOID)Pos, (PVOID)ParametersPath->Buffer, ParametersPath->Length); + pos += KeyInfo->NameLength / sizeof(WCHAR); + pos[0] = UNICODE_NULL; + + DPRINT("All OK\n"); + return name; +} + +#define FreeRegistryPathInfo(ptr) \ + ExFreePool(ptr) + + +#define TAG_REG_INFO (ULONG)'IgeR' +#define TAG_REG_NAME (ULONG)'NgeR' + +NTSTATUS STDCALL +EnumerateSubkey( + PUNICODE_STRING RegistryPath, + PWSTR Subkey, + PREGISTRY_CALLBACK_ROUTINE Callback, + PDRIVER_OBJECT DriverObject) +{ + NTSTATUS status; + UNICODE_STRING subkey_name; + HANDLE devices_key_handle; + + ULONG key_index = 0; + ULONG result_length; + + status = OpenSubkey(RegistryPath, Subkey, KEY_ENUMERATE_SUB_KEYS, &devices_key_handle); + + if ( ! NT_SUCCESS(status) ) + return status; + + while ( TRUE ) + { + KEY_BASIC_INFORMATION test_info; + PKEY_BASIC_INFORMATION info; + ULONG size; + PWSTR name; + + status = ZwEnumerateKey(devices_key_handle, + key_index, + KeyBasicInformation, + &test_info, + sizeof(test_info), + &result_length); + + if ( status == STATUS_NO_MORE_ENTRIES ) + break; + + size = result_length + FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]); + + info = (PKEY_BASIC_INFORMATION) ExAllocatePoolWithTag(PagedPool, size, TAG_REG_INFO); + + if ( ! info ) + { + DPRINT("Out of memory\n"); + status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + status = ZwEnumerateKey(devices_key_handle, + key_index, + KeyBasicInformation, + info, + size, + &result_length); + + if ( ! NT_SUCCESS(status) ) + { + DPRINT("Unable to enumerate keys\n"); + ExFreePoolWithTag(info, TAG_REG_INFO); + status = STATUS_INTERNAL_ERROR; + break; + } + + /* Is this ok? */ + RtlInitUnicodeString(&subkey_name, Subkey); + + name = AllocateRegistryPathInfo(RegistryPath, &subkey_name, info); + + if ( ! name ) + { + DPRINT("Out of memory\n"); + ExFreePoolWithTag(info, TAG_REG_INFO); + status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + ExFreePoolWithTag(info, TAG_REG_INFO); + + /* Call the callback */ + status = Callback(DriverObject, name); + + FreeRegistryPathInfo(name); + + if ( ! NT_SUCCESS(status) ) + { + DPRINT("Callback FAILED\n"); + break; + } + + key_index ++; + } + + ZwClose(devices_key_handle); + + DPRINT("Found %d subkey entries\n", key_index); + + if ( ( key_index == 0 ) && ( status == STATUS_NO_MORE_ENTRIES ) ) + return STATUS_DEVICE_CONFIGURATION_ERROR; + + if ( status == STATUS_NO_MORE_ENTRIES ) + status = STATUS_SUCCESS; + + return status; +} + +#define EnumerateDeviceKeys(path, callback, driver_obj) \ + EnumerateSubkey(path, L"Devices", callback, driver_obj) + + +NTSTATUS +CreateDeviceName( + PCWSTR PrePrefix, + PCWSTR Prefix, + UCHAR Index, + PUNICODE_STRING DeviceName) +{ + UNICODE_STRING number; + WCHAR number_buffer[5]; + UNICODE_STRING unicode_pre_prefix; + UNICODE_STRING unicode_prefix; + ULONG size; + + RtlInitUnicodeString(&unicode_pre_prefix, PrePrefix); + RtlInitUnicodeString(&unicode_prefix, Prefix); + + size = unicode_pre_prefix.Length + + unicode_prefix.Length + + sizeof(number_buffer) + + sizeof(UNICODE_NULL); + + DeviceName->Buffer = ExAllocatePool(PagedPool, size); + DeviceName->MaximumLength = (USHORT) size; + + if ( ! DeviceName->Buffer ) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyUnicodeString(DeviceName, &unicode_pre_prefix); + RtlAppendUnicodeStringToString(DeviceName, &unicode_prefix); + + if ( Index != 255 ) + { + number.Buffer = number_buffer; + number.MaximumLength = sizeof(number_buffer); + + RtlIntegerToUnicodeString((ULONG) Index, 10, &number); + RtlAppendUnicodeStringToString(DeviceName, &number); + } + + DeviceName->Buffer[DeviceName->Length / sizeof(UNICODE_NULL)] = UNICODE_NULL; + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +InitializeSoundBlaster( + PDRIVER_OBJECT DriverObject, + PWSTR RegistryPath) +{ + NTSTATUS status; + PDEVICE_OBJECT device_object; + PSOUND_BLASTER_PARAMETERS parameters = NULL; + UNICODE_STRING device_name; + UNICODE_STRING dos_device_name; + + UCHAR device_index = 0; + + DPRINT("Initializing a Sound Blaster device\n"); + + /* Change these later */ + status = CreateDeviceName(L"", + L"\\Device\\WaveOut", + device_index, + &device_name); + + if ( ! NT_SUCCESS(status) ) + return status; + + status = CreateDeviceName(L"\\DosDevices\\", + L"\\Device\\WaveOut" + wcslen(L"\\Device\\"), + device_index, + &dos_device_name); + + if ( ! NT_SUCCESS(status) ) + { + /* TODO */ + return status; + } + + DPRINT("Device: %wZ\n", device_name); + DPRINT("Symlink: %wZ\n", dos_device_name); + + /* + Create the device and DOS symlink + */ + + status = IoCreateDevice(DriverObject, + sizeof(SOUND_BLASTER_PARAMETERS), + &device_name, + FILE_DEVICE_SOUND, + 0, + FALSE, + &device_object); + + if ( ! NT_SUCCESS(status) ) + return status; + + DPRINT("Created a device extension at 0x%x\n", device_object->DeviceExtension); + parameters = device_object->DeviceExtension; + + status = IoCreateSymbolicLink(&dos_device_name, &device_name); + + ExFreePool(dos_device_name.Buffer); + ExFreePool(device_name.Buffer); + + if ( ! NT_SUCCESS(status) ) + { + IoDeleteDevice(device_object); + device_object = NULL; + return status; + } + + /* IoRegisterShutdownNotification( */ + + /* + Settings + */ + + device_object->AlignmentRequirement = FILE_BYTE_ALIGNMENT; + + parameters->driver = DriverObject; + parameters->registry_path = RegistryPath; + parameters->port = DEFAULT_PORT; + parameters->irq = DEFAULT_IRQ; + parameters->dma = DEFAULT_DMA; + parameters->buffer_size = DEFAULT_BUFFER_SIZE; + + /* TODO: Load the settings from the registry */ + + DPRINT("Port %x IRQ %d DMA %d\n", parameters->port, parameters->irq, parameters->dma); + + DPRINT("Resetting the sound card\n"); + + if ( ! ResetSoundBlaster(parameters) ) + { + /* TODO */ + return STATUS_UNSUCCESSFUL; + } + + /* + DPRINT("What kind of SB card is this?\n"); + GetSoundBlasterModel(parameters); + */ + + return STATUS_SUCCESS; +} + + +NTSTATUS STDCALL +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + NTSTATUS status; + + DPRINT("Sound Blaster driver 0.1 by Silver Blade\n"); + + DriverObject->Flags = 0; + DriverObject->MajorFunction[IRP_MJ_CREATE] = CreateSoundBlaster; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = CloseSoundBlaster; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = CleanupSoundBlaster; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ControlSoundBlaster; + DriverObject->MajorFunction[IRP_MJ_WRITE] = WriteSoundBlaster; + DriverObject->DriverUnload = UnloadSoundBlaster; + + DPRINT("Beginning device key enumeration\n"); + + status = EnumerateDeviceKeys(RegistryPath, *InitializeSoundBlaster, DriverObject); + + return status; +} Added: trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def (added) +++ trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def Thu Mar 15 00:31:31 2007 @@ -1,0 +1,6 @@ +; +; Exports definition file for sb16_ks.sys +; +EXPORTS +DriverEntry@8 + Added: trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild (added) +++ trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild Thu Mar 15 00:31:31 2007 @@ -1,0 +1,11 @@ +<module name="sb16_nt4" type="exportdriver" installbase="system32/drivers" installname="sndblst.sys" allowwarnings="true"> + <include base="sb16_nt4">.</include> + <include base="sb16_nt4">..</include> + <importlibrary definition="sb16_nt4.def" /> + <library>ntoskrnl</library> + <library>hal</library> + <define name="__USE_W32API" /> + <file>main.c</file> + <file>control.c</file> + <file>interrupt.c</file> +</module> Added: trunk/reactos/drivers/multimedia/sb16_nt4/sndblst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/sndblst.h (added) +++ trunk/reactos/drivers/multimedia/sb16_nt4/sndblst.h Thu Mar 15 00:31:31 2007 @@ -1,0 +1,155 @@ +#ifndef SNDBLST_H +#define SNDBLST_H + +#include <debug.h> +#include <ntddk.h> + +#define SB_WAVE_IN_DEVICE_NAME L"\\Device\\SBWaveIn" +#define SB_WAVE_OUT_DEVICE_NAME L"\\Device\\SBWaveOut" +/* TODO: MIDI */ +#define SB_AUX_DEVICE_NAME L"\\Device\\SBAux" +#define SB_MIXER_DEVICE_NAME L"\\Device\\SBMixer" + +#define DEFAULT_PORT 0x220 +#define DEFAULT_IRQ 5 +#define DEFAULT_DMA 1 +#define DEFAULT_BUFFER_SIZE 65535 + +#define SB_TIMEOUT 1000000 + +#define SB_DSP_READY 0xaa + +enum +{ + NotDetected, + SoundBlaster, + SoundBlasterPro, + SoundBlaster2, + SoundBlasterPro2, + SoundBlasterProMCV, + SoundBlaster16 +}; + +enum +{ + SB_RESET_PORT = 0x06, + SB_READ_DATA_PORT = 0x0a, + SB_WRITE_DATA_PORT = 0x0c, + SB_WRITE_STATUS_PORT = 0x0c, + SB_READ_STATUS_PORT = 0x0e +}; + +enum +{ + SbAutoInitDmaOutput = 0x1c, + SbAutoInitDmaInput = 0x2c, + SbSetOutputRate = 0x41, /* DSP v4.xx */ + SbSetInputRate = 0x42, /* DSP v4.xx */ + SbSetBlockSize = 0x48, /* DSP v2.00 + */ + SbPauseDac = 0x80, + SbPauseDmaOutput = 0xd0, + SbEnableSpeaker = 0xd1, + SbDisableSpeaker = 0xd3, + SbGetSpeakerStatus = 0xd8, /* DSP v2.00 + */ + SbGetDspVersion = 0xe1 +}; + +typedef struct _SOUND_BLASTER_PARAMETERS +{ + PDRIVER_OBJECT driver; + PWSTR registry_path; + PKINTERRUPT interrupt; + ULONG port; + ULONG irq; + ULONG dma; + ULONG buffer_size; + USHORT dsp_version; +} SOUND_BLASTER_PARAMETERS, *PSOUND_BLASTER_PARAMETERS; + + +typedef STDCALL NTSTATUS REGISTRY_CALLBACK_ROUTINE(PDRIVER_OBJECT DriverObject, PWSTR RegistryPath); +typedef REGISTRY_CALLBACK_ROUTINE *PREGISTRY_CALLBACK_ROUTINE; + + +/* + Port I/O +*/ + +#define SbWrite(sbdevice, subport, data) \ + WRITE_PORT_UCHAR((PUCHAR) sbdevice->port + subport, data) + +#define SbRead(sbdevice, subport) \ + READ_PORT_UCHAR((PUCHAR) sbdevice->port + subport) + +#define SbWriteReset(sbdevice, data) \ + SbWrite(sbdevice, SB_RESET_PORT, data) + +#define SbWriteDataWithoutWait(sbdevice, data) \ + SbWrite(sbdevice, SB_WRITE_DATA_PORT, data) + +#define SbReadDataWithoutWait(sbdevice) \ + SbRead(sbdevice, SB_READ_DATA_PORT) + + +#define SbGetWriteStatus(sbdevice) \ + SbRead(sbdevice, SB_WRITE_STATUS_PORT) + +#define SbGetReadStatus(sbdevice) \ + SbRead(sbdevice, SB_READ_STATUS_PORT) + + + +BOOLEAN +WaitForReady( + PSOUND_BLASTER_PARAMETERS SBDevice, + UCHAR Port); + +#define WaitToWrite(sbdevice) \ + WaitForReady(sbdevice, SB_WRITE_STATUS_PORT) + +#define WaitToRead(sbdevice) \ + WaitForReady(sbdevice, SB_READ_STATUS_PORT) + +BOOLEAN +ResetSoundBlaster( + PSOUND_BLASTER_PARAMETERS SBDevice); + +ULONG +GetSoundBlasterModel( + PSOUND_BLASTER_PARAMETERS SBDevice); + +BOOLEAN +IsSampleRateCompatible( + PSOUND_BLASTER_PARAMETERS SBDevice, + ULONG SampleRate); + +BOOLEAN +SetOutputSampleRate( + PSOUND_BLASTER_PARAMETERS SBDevice, + ULONG SampleRate); + +BOOLEAN +EnableSpeaker( + PSOUND_BLASTER_PARAMETERS SBDevice); + +BOOLEAN +DisableSpeaker( + PSOUND_BLASTER_PARAMETERS SBDevice); + +BOOLEAN +StartSoundOutput( + PSOUND_BLASTER_PARAMETERS SBDevice, + ULONG BitDepth, + ULONG Channels, + ULONG BlockSize); + + +/* + interrupt.c +*/ + +NTSTATUS +EnableIrq( + PDEVICE_OBJECT DeviceObject); + +#endif Added: trunk/reactos/drivers/multimedia/stdunk/stdunk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/stdunk/… ============================================================================== --- trunk/reactos/drivers/multimedia/stdunk/stdunk.c (added) +++ trunk/reactos/drivers/multimedia/stdunk/stdunk.c Thu Mar 15 00:31:31 2007 @@ -1,0 +1,62 @@ +/* + "Unknown" implementation, in C + by Andrew Greenwood + + Not quite sure how this is used, but the C++ variant is intended for + implementing a NonDelegatingUnknown object +*/ + +#include <stdunk.h> + +STDMETHODCALLTYPE +NTSTATUS +Unknown_QueryInterface( + IUnknown* this, + IN REFIID refiid, + OUT PVOID* output) +{ + /* TODO */ + return STATUS_SUCCESS; +} + +STDMETHODCALLTYPE +ULONG +Unknown_AddRef( + IUnknown* unknown_this) +{ + struct CUnknown* this = CONTAINING_RECORD(unknown_this, struct CUnknown, IUnknown); + + InterlockedIncrement(&this->m_ref_count); + return this->m_ref_count; +} + +STDMETHODCALLTYPE +ULONG +Unknown_Release( + IUnknown* unknown_this) +{ + struct CUnknown* this = CONTAINING_RECORD(unknown_this, struct CUnknown, IUnknown); + + InterlockedDecrement(&this->m_ref_count); + + if ( this->m_ref_count == 0 ) + { + ExFreePool(this); + return 0; + } + + return this->m_ref_count; +} + + +/* + The vtable for Unknown +*/ + +const IUnknownVtbl UnknownVtbl = +{ + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release +}; + Added: trunk/reactos/drivers/multimedia/stdunk/stdunk.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/stdunk/… ============================================================================== --- trunk/reactos/drivers/multimedia/stdunk/stdunk.cpp (added) +++ trunk/reactos/drivers/multimedia/stdunk/stdunk.cpp Thu Mar 15 00:31:31 2007 @@ -1,0 +1,98 @@ +/* + TODO: + Need to call ASSERT on m_ref_count to ensure it is valid. +*/ + +#define PUT_GUIDS_HERE + +//#include <portcls.h> +#include <punknown.h> +#include <stdunk.h> + +#include <ntddk.h> + + +/* + HACK ALERT + This is a little bit of a hack, but ReactOS doesn't seem to have this + defined. TODO: Make the aligned test truly aligned. +*/ + +#define IsEqualGUID(a, b) \ + RtlEqualMemory(&a, &b, sizeof(GUID)) + +#define IsEqualGUIDAligned(a, b) \ + IsEqualGUID(a, b) + +/* + Shut the linker up - can also pass -defsym ___cxa_pure_virtual=0 +*/ +extern "C" void __cxa_pure_virtual(void) {} + +/* + IUnknown +*/ + +CUnknown::CUnknown(PUNKNOWN outer_unknown) +{ + m_ref_count = 0; + + if ( outer_unknown ) + { + m_outer_unknown = outer_unknown; + } + else + { + m_outer_unknown = PUNKNOWN(dynamic_cast<PNONDELEGATINGUNKNOWN>(this)); + } +} + +CUnknown::~CUnknown() +{ +} + +/* + INonDelegatingUnknown +*/ + +STDMETHODIMP_(ULONG) +CUnknown::NonDelegatingAddRef(void) +{ + InterlockedIncrement(&m_ref_count); + return m_ref_count; +} + +STDMETHODIMP_(ULONG) +CUnknown::NonDelegatingRelease(void) +{ + if ( InterlockedDecrement(&m_ref_count) == 0 ) + { + delete this; + return 0; + } + + return m_ref_count; +} + +STDMETHODIMP_(NTSTATUS) +CUnknown::NonDelegatingQueryInterface( + IN REFIID iid, + IN PVOID* ppvoid) +{ + //if ( RtlEqualMemory(&iid, &IID_IUnknown, sizeof(GUID)) ) + { + *ppvoid = (PVOID)((PUNKNOWN) this); + } + // else + { + *ppvoid = NULL; + } + + if ( *ppvoid ) + { + ((PUNKNOWN)(*ppvoid))->AddRef(); + return STATUS_SUCCESS; + } + + return STATUS_INVALID_PARAMETER; +}

1 0

[silverblade] 26102: Basic beginnings of an MPU401 driver (forgot to commit with last files)
by silverblade＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: silverblade Date: Wed Mar 14 23:50:42 2007 New Revision: 26102 URL: http://svn.reactos.org/svn/reactos?rev=26102&view=rev Log: Basic beginnings of an MPU401 driver (forgot to commit with last files) Added: trunk/reactos/drivers/multimedia/mpu401_ks/ trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.def trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.rbuild trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.rc Added: trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/mpu401_… ============================================================================== --- trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp (added) +++ trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp Wed Mar 14 23:50:42 2007 @@ -1,0 +1,97 @@ +/* + ReactOS Operating System + MPU401 Example KS Driver + + AUTHORS: + Andrew Greenwood + + NOTES: + This is an example MPU401 driver. You can use DirectMusic instead with + this, by changing the CLSIDs accordingly. +*/ + +#define MAX_MINIPORTS 1 + +#define PUT_GUIDS_HERE + +#include <portcls.h> + +extern "C" +NTSTATUS +StartDevice( + IN PDEVICE_OBJECT pDeviceObject, + IN PIRP pIrp, + IN PRESOURCELIST ResourceList) +{ + if ( ! ResourceList ) + return STATUS_INVALID_PARAMETER; + + if ( ResourceList->NumberOfEntries() == 0 ) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + PPORT port; + PMINIPORT miniport; + + NTSTATUS status; + + status = PcNewPort(&port, CLSID_PortMidi); + + if ( ! NT_SUCCESS(status) ) + { + return status; + } + + status = PcNewMiniport(&miniport, CLSID_MiniportDriverUart); + + if ( ! NT_SUCCESS(status) ) + { + return status; + } + + status = port->Init(pDeviceObject, pIrp, miniport, NULL, ResourceList); + + if ( ! NT_SUCCESS(status) ) + { + return status; + } + + status = PcRegisterSubdevice(pDeviceObject, L"Uart", port); + + if ( ! NT_SUCCESS(status) ) + { + /* just print an error here */ + } + + miniport->Release(); + port->Release(); + + return status; +} + + +extern "C" +NTSTATUS +AddDevice( + IN PVOID Context1, + IN PVOID Context2) +{ + return PcAddAdapterDevice((PDRIVER_OBJECT) Context1, + (PDEVICE_OBJECT) Context2, + StartDevice, + MAX_MINIPORTS, + 0); +} + + +extern "C" +NTSTATUS +DriverEntry( + IN PVOID Context1, + IN PVOID Context2) +{ + return PcInitializeAdapterDriver((PDRIVER_OBJECT) Context1, + (PUNICODE_STRING) Context2, + (PDRIVER_ADD_DEVICE) AddDevice); +}; Added: trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/mpu401_… ============================================================================== --- trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.def (added) +++ trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.def Wed Mar 14 23:50:42 2007 @@ -1,0 +1,6 @@ +; +; Exports definition file for mpu401_ks.sys +; +EXPORTS +DriverEntry@8 + Added: trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/mpu401_… ============================================================================== --- trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.rbuild (added) +++ trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.rbuild Wed Mar 14 23:50:42 2007 @@ -1,0 +1,10 @@ +<module name="mpu401_ks" type="exportdriver" installbase="system32/drivers" installname="mpu401_ks.sys" allowwarnings="true"> + <include base="mpu401">.</include> + <include base="mpu401">..</include> + <importlibrary definition="mpu401.def" /> + <library>ntoskrnl</library> + <library>portcls</library> + <define name="__USE_W32API" /> + <file>mpu401.rc</file> + <file>adapter.cpp</file> +</module> Added: trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/mpu401_… ============================================================================== --- trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.rc (added) +++ trunk/reactos/drivers/multimedia/mpu401_ks/mpu401.rc Wed Mar 14 23:50:42 2007 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "MPU401 KS Driver\0" +#define REACTOS_STR_INTERNAL_NAME "mpu401_ks\0" +#define REACTOS_STR_ORIGINAL_FILENAME "mpu401_ks.sys\0" +#include <reactos/version.rc>

1 0

[ion] 26101: - Move libcntpr to /sdk. Couldn't do rename+move atomically.
by ion＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: ion Date: Wed Mar 14 23:34:10 2007 New Revision: 26101 URL: http://svn.reactos.org/svn/reactos?rev=26101&view=rev Log: - Move libcntpr to /sdk. Couldn't do rename+move atomically. Added: trunk/reactos/lib/sdk/libcntpr/ - copied from r26100, trunk/reactos/lib/libcntpr/ Removed: trunk/reactos/lib/libcntpr/ Modified: trunk/reactos/lib/lib.rbuild trunk/reactos/lib/sdk/sdk.rbuild Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=26101&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild (original) +++ trunk/reactos/lib/lib.rbuild Wed Mar 14 23:34:10 2007 @@ -25,9 +25,6 @@ <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" /> </directory> - <directory name="libcntpr"> - <xi:include href="libcntpr/libcntpr.rbuild" /> - </directory> <directory name="pseh"> <xi:include href="pseh/pseh.rbuild" /> </directory> Modified: trunk/reactos/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/sdk.rbuild?rev=261… ============================================================================== --- trunk/reactos/lib/sdk/sdk.rbuild (original) +++ trunk/reactos/lib/sdk/sdk.rbuild Wed Mar 14 23:34:10 2007 @@ -6,6 +6,9 @@ </directory> <directory name="dxguid"> <xi:include href="dxguid/dxguid.rbuild" /> + </directory> + <directory name="libcntpr"> + <xi:include href="libcntpr/libcntpr.rbuild" /> </directory> <directory name="nt"> <xi:include href="nt/nt.rbuild" />

1 0

[ion] 26100: - Rename libcntptr->libcntpr. I don't know what the f*ck happened but it was named _correctly_ on my system, then got committed with the wrong name, while svn still matched it locally.
by ion＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: ion Date: Wed Mar 14 23:33:22 2007 New Revision: 26100 URL: http://svn.reactos.org/svn/reactos?rev=26100&view=rev Log: - Rename libcntptr->libcntpr. I don't know what the f*ck happened but it was named _correctly_ on my system, then got committed with the wrong name, while svn still matched it locally. Added: trunk/reactos/lib/libcntpr/ - copied from r26099, trunk/reactos/lib/libcntptr/ Removed: trunk/reactos/lib/libcntptr/

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2007