Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 09:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed debug messages from queuing code (sorry)

Browse source 
Added __int64 datatype to files that use it
Hid bug in ide driver (or somewhere) for now

svn path=/trunk/; revision=920
This commit is contained in:
David Welch 2000-01-06 00:26:16 +00:00
parent 623093eaaa
commit 4d8c6a710b
7 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/drivers/dd/ide/ide.c
View file

@ -1,4 +1,4 @@
/* $Id: ide.c,v 1.25 1999/12/30 01:51:40 dwelch Exp $ /* $Id: ide.c,v 1.26 2000/01/06 00:26:16 dwelch Exp $
* *
* IDE.C - IDE Disk driver * IDE.C - IDE Disk driver
* written by Rex Jolliff * written by Rex Jolliff
@ -2023,9 +2023,12 @@ IDEIoTimer(PDEVICE_OBJECT DeviceObject,
if (++ControllerExtension->Retries > IDE_MAX_CMD_RETRIES) if (++ControllerExtension->Retries > IDE_MAX_CMD_RETRIES)
{ {
DPRINT("Max retries has been reached, IRP finished with error\n"); DPRINT("Max retries has been reached, IRP finished with error\n");
ControllerExtension->CurrentIrp->IoStatus.Status = STATUS_IO_TIMEOUT; if (ControllerExtension->CurrentIrp != NULL)
ControllerExtension->CurrentIrp->IoStatus.Information = 0; {
IDEFinishOperation(ControllerExtension); ControllerExtension->CurrentIrp->IoStatus.Status = STATUS_IO_TIMEOUT;
ControllerExtension->CurrentIrp->IoStatus.Information = 0;
IDEFinishOperation(ControllerExtension);
}
ControllerExtension->TimerState = IDETimerIdle; ControllerExtension->TimerState = IDETimerIdle;
ControllerExtension->TimerCount = 0; ControllerExtension->TimerCount = 0;
} }

6
reactos/lib/ntdll/stdlib/atoi64.c
View file

@ -1,4 +1,4 @@
/* $Id: atoi64.c,v 1.1 1999/12/30 01:32:35 ekohl Exp $ /* $Id: atoi64.c,v 1.2 2000/01/06 00:26:15 dwelch Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -9,6 +9,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
typedef long long __int64;
__int64 __int64
_atoi64 (const char *nptr) _atoi64 (const char *nptr)
{ {
@ -38,4 +40,4 @@ _atoi64 (const char *nptr)
return value; return value;
} }
/* EOF */ /* EOF */

8
reactos/lib/ntdll/stdlib/itoa.c
View file

@ -11,6 +11,8 @@
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
#include <stdlib.h> #include <stdlib.h>
typedef long long __int64;
typedef unsigned long long __uint64;
char * char *
_i64toa(__int64 value, char *string, int radix) _i64toa(__int64 value, char *string, int radix)
@ -18,7 +20,7 @@ _i64toa(__int64 value, char *string, int radix)
char tmp[65]; char tmp[65];
char *tp = tmp; char *tp = tmp;
__int64 i; __int64 i;
unsigned __int64 v; __uint64 v;
__int64 sign; __int64 sign;
char *sp; char *sp;
@ -31,7 +33,7 @@ _i64toa(__int64 value, char *string, int radix)
if (sign) if (sign)
v = -value; v = -value;
else else
v = (unsigned __int64)value; v = (__uint64)value;
while (v || tp == tmp) while (v || tp == tmp)
{ {
i = v % radix; i = v % radix;
@ -161,4 +163,4 @@ _ultoa(unsigned long value, char *string, int radix)
*sp++ = *--tp; *sp++ = *--tp;
*sp = 0; *sp = 0;
return string; return string;
} }

7
reactos/lib/ntdll/stdlib/itow.c
View file

@ -11,13 +11,16 @@
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
#include <stdlib.h> #include <stdlib.h>
typedef long long __int64;
typedef unsigned long long __uint64;
wchar_t * wchar_t *
_i64tow(__int64 value, wchar_t *string, int radix) _i64tow(__int64 value, wchar_t *string, int radix)
{ {
wchar_t tmp[65]; wchar_t tmp[65];
wchar_t *tp = tmp; wchar_t *tp = tmp;
__int64 i; __int64 i;
unsigned __int64 v; __uint64 v;
__int64 sign; __int64 sign;
wchar_t *sp; wchar_t *sp;
@ -30,7 +33,7 @@ _i64tow(__int64 value, wchar_t *string, int radix)
if (sign) if (sign)
v = -value; v = -value;
else else
v = (unsigned __int64)value; v = (__uint64)value;
while (v || tp == tmp) while (v || tp == tmp)
{ {
i = v % radix; i = v % radix;

7
reactos/lib/ntdll/stdlib/wtoi64.c
View file

@ -1,4 +1,4 @@
/* $Id: wtoi64.c,v 1.1 1999/12/30 01:32:35 ekohl Exp $ /* $Id: wtoi64.c,v 1.2 2000/01/06 00:26:15 dwelch Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -9,6 +9,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
typedef long long __int64;
typedef unsigned long long __uint64;
__int64 __int64
_wtoi64 (const wchar_t *nptr) _wtoi64 (const wchar_t *nptr)
{ {
@ -38,4 +41,4 @@ _wtoi64 (const wchar_t *nptr)
return value; return value;
} }
/* EOF */ /* EOF */

2
reactos/ntoskrnl/io/queue.c
View file

@ -10,7 +10,7 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
//#define NDEBUG #define NDEBUG
#include <internal/debug.h> #include <internal/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

2
reactos/ntoskrnl/ke/kqueue.c
View file

@ -12,7 +12,7 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
//#define NDEBUG #define NDEBUG
#include <internal/debug.h> #include <internal/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/