Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replaced calls to _printk() by calls to DbgPrint().

Browse source 
svn path=/trunk/; revision=696
This commit is contained in:
Eric Kohl 1999-10-14 16:54:17 +00:00
parent babfe77ea9
commit 4551dfba1e
8 changed files with 38 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/include/internal/ntoskrnl.h
View file

@ -39,12 +39,6 @@ extern descriptor gdt[256];
/*
* printf style functions
*/
void __putchar(char c);
void __goxy(unsigned x, unsigned y);
unsigned __wherex (void);
unsigned __wherey (void);
void __getscreensize (unsigned *maxx, unsigned *maxy);
asmlinkage void printk(const char* fmt, ...);
int vsprintf(char *buf, const char *fmt, va_list args);
int sprintf(char* buf, const char* fmt, ...);
@ -94,6 +88,4 @@ VOID KeInit(VOID);
VOID HalInitConsole(boot_param* bp);
VOID CmInitializeRegistry(VOID);
extern WCHAR wtolower(WCHAR ch);
#endif

4
reactos/ntoskrnl/hal/x86/bios32.c
View file

@ -83,7 +83,7 @@ BOOL static checksum(bios32* service_entry)
{
sum=sum+p[i];
}
// printk("sum = %d\n",sum);
// DbgPrint("sum = %d\n",sum);
if (sum==0)
{
return(TRUE);
@ -131,7 +131,7 @@ VOID Hal_bios32_probe()
{
continue;
}
// printk("Signature detected at %x\n",i);
// DbgPrint("Signature detected at %x\n",i);
if (!checksum(service_entry))
{
continue;

4
reactos/ntoskrnl/hal/x86/exp.c
View file

@ -244,7 +244,7 @@ asmlinkage void exception_handler(unsigned int edi,
DbgPrint("ESP %x\n",esp);
stack = (unsigned int *) (esp + 24);
printk("Stack:\n");
DbgPrint("Stack:\n");
for (i = 0; i < 16; i = i + 4)
{
DbgPrint("%.8x %.8x %.8x %.8x\n",
@ -253,7 +253,7 @@ asmlinkage void exception_handler(unsigned int edi,
stack[i+2],
stack[i+3]);
}
printk("Frames:\n");
DbgPrint("Frames:\n");
for (i = 0; i < 32; i++)
{
if (stack[i] > ((unsigned int) &stext))

2
reactos/ntoskrnl/hal/x86/irq.c
View file

@ -391,7 +391,7 @@ ULONG HalGetInterruptVector(INTERFACE_TYPE InterfaceType,
default:
ret = -1;
printk("(%s:%d) Don't know that bus type\n",__FILE__,__LINE__);
DbgPrint("(%s:%d) Don't know that bus type\n",__FILE__,__LINE__);
break;
}
return(ret);

86
reactos/ntoskrnl/hal/x86/printk.c
View file

@ -113,6 +113,9 @@ static unsigned int in_hal_console = 1;
/* FUNCTIONS ***************************************************************/
void __putchar(char c);
void HalSwitchToBlueScreen(void)
/*
* FUNCTION: Switches the monitor to text mode and writes a blue background
@ -164,11 +167,18 @@ void HalDisplayString(char* string)
* mode
*/
{
char* str=string;
if (!in_hal_console)
{
HalSwitchToBlueScreen();
}
printk("%s",string);
while ((*str)!=0)
{
__putchar(*str);
str++;
}
}
void __putchar(char c)
@ -219,24 +229,7 @@ void __putchar(char c)
cursorx = 0;
}
}
#if 0
if (lines_seen == 24)
{
char str[] = "--- press escape to continue";
lines_seen = 0;
for (i = 0; str[i] != 0; i++)
{
vidmem[NR_COLUMNS*(NR_ROWS-1)*2+i*2] = str[i];
vidmem[NR_COLUMNS*(NR_ROWS-1)*2+i*2+1] = CharAttribute;
}
while (inb_p(0x60)!=0x81);
memset(&vidmem[NR_COLUMNS*(NR_ROWS-1)*2],0,NR_COLUMNS*2);
}
#endif
if (cursory >= NR_ROWS)
{
unsigned short *LinePtr;
@ -265,55 +258,10 @@ void __putchar(char c)
outb_p(CRTC_DATA, offset);
}
asmlinkage void printk(const char* fmt, ...)
/*
* FUNCTION: Print a formatted string to the hal console
* ARGUMENTS: As for printf
* NOTE: So it can used from irq handlers this function disables interrupts
* during its execution, they are restored to the previous state on return
*/
{
char buffer[256];
char* str=buffer;
va_list ap;
unsigned int eflags;
/*
* Because this is used by alomost every subsystem including irqs it
* must be atomic. The following code sequence disables interrupts after
* saving the previous state of the interrupt flag
*/
__asm__("pushf\n\tpop %0\n\tcli\n\t"
: "=m" (eflags)
: /* */);
/*
* Process the format string into a fixed length buffer using the
* standard C RTL function
*/
va_start(ap,fmt);
vsprintf(buffer,fmt,ap);
va_end(ap);
while ((*str)!=0)
{
__putchar(*str);
str++;
}
/*
* Restore the interrupt flag
*/
__asm__("push %0\n\tpopf\n\t"
:
: "m" (eflags));
}
ULONG DbgPrint(PCH Format, ...)
{
char buffer[256];
char* str=buffer;
va_list ap;
unsigned int eflags;
@ -333,13 +281,9 @@ ULONG DbgPrint(PCH Format, ...)
va_start(ap,Format);
vsprintf(buffer,Format,ap);
va_end(ap);
while ((*str)!=0)
{
__putchar(*str);
str++;
}
HalDisplayString (buffer);
/*
* Restore the interrupt flag
*/

6
reactos/ntoskrnl/ke/main.c
View file

@ -1,4 +1,4 @@
/* $Id: main.c,v 1.23 1999/10/07 23:36:00 ekohl Exp $
/* $Id: main.c,v 1.24 1999/10/14 16:53:30 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -57,7 +57,7 @@ void set_breakpoint(unsigned int i, unsigned int addr, unsigned int type,
if (i>3)
{
printk("Invalid breakpoint index at %s:%d\n",__FILE__,__LINE__);
DbgPrint("Invalid breakpoint index at %s:%d\n",__FILE__,__LINE__);
return;
}
@ -210,7 +210,7 @@ asmlinkage void _main(boot_param* _bp)
/*
* Enter idle loop
*/
printk("Finished main()\n");
DbgPrint("Finished main()\n");
PsTerminateSystemThread(STATUS_SUCCESS);
}

4
reactos/ntoskrnl/mm/mm.c
View file

@ -197,7 +197,7 @@ asmlinkage int page_fault_handler(unsigned int cs,
*/
if (cs != KERNEL_CS)
{
printk("%s:%d\n",__FILE__,__LINE__);
DbgPrint("%s:%d\n",__FILE__,__LINE__);
return(0);
}
FaultMode = UserMode;
@ -210,7 +210,7 @@ asmlinkage int page_fault_handler(unsigned int cs,
MemoryArea = MmOpenMemoryAreaByAddress(PsGetCurrentProcess(),(PVOID)cr2);
if (MemoryArea == NULL)
{
printk("%s:%d\n",__FILE__,__LINE__);
DbgPrint("%s:%d\n",__FILE__,__LINE__);
return(0);
}

26
reactos/ntoskrnl/mm/npool.c
View file

@ -161,22 +161,22 @@ static void validate_free_list(void)
(base_addr+current->size) >
(kernel_pool_base)+NONPAGED_POOL_SIZE)
{
printk("Block %x found outside pool area\n",current);
printk("Size %d\n",current->size);
printk("Limits are %x %x\n",kernel_pool_base,
DbgPrint("Block %x found outside pool area\n",current);
DbgPrint("Size %d\n",current->size);
DbgPrint("Limits are %x %x\n",kernel_pool_base,
kernel_pool_base+NONPAGED_POOL_SIZE);
KeBugCheck(KBUG_POOL_FREE_LIST_CORRUPT);
}
blocks_seen++;
if (blocks_seen > nr_free_blocks)
{
printk("Too many blocks on list\n");
DbgPrint("Too many blocks on list\n");
KeBugCheck(KBUG_POOL_FREE_LIST_CORRUPT);
}
// verify_for_write(base_addr,current->size);
if (current->next!=NULL&&current->next->previous!=current)
{
printk("%s:%d:Break in list (current %x next %x "
DbgPrint("%s:%d:Break in list (current %x next %x "
"current->next->previous %x)\n",
__FILE__,__LINE__,current,current->next,
current->next->previous);
@ -208,19 +208,19 @@ static void validate_used_list(void)
(base_addr+current->size) >
(kernel_pool_base)+NONPAGED_POOL_SIZE)
{
printk("Block %x found outside pool area\n",current);
DbgPrint("Block %x found outside pool area\n",current);
for(;;);
}
blocks_seen++;
if (blocks_seen > EiNrUsedBlocks)
{
printk("Too many blocks on list\n");
DbgPrint("Too many blocks on list\n");
for(;;);
}
// verify_for_write(base_addr,current->size);
if (current->next!=NULL&&current->next->previous!=current)
{
printk("Break in list (current %x next %x)\n",
DbgPrint("Break in list (current %x next %x)\n",
current,current->next);
for(;;);
}
@ -251,14 +251,14 @@ static void check_duplicates(block_hdr* blk)
if ( (int)current > base && (int)current < last )
{
printk("intersecting blocks on list\n");
DbgPrint("intersecting blocks on list\n");
for(;;);
}
if ( (int)current < base &&
((int)current + current->size + sizeof(block_hdr))
> base )
{
printk("intersecting blocks on list\n");
DbgPrint("intersecting blocks on list\n");
for(;;);
}
current=current->next;
@ -268,14 +268,14 @@ static void check_duplicates(block_hdr* blk)
{
if ( (int)current > base && (int)current < last )
{
printk("intersecting blocks on list\n");
DbgPrint("intersecting blocks on list\n");
for(;;);
}
if ( (int)current < base &&
((int)current + current->size + sizeof(block_hdr))
> base )
{
printk("intersecting blocks on list\n");
DbgPrint("intersecting blocks on list\n");
for(;;);
}
current=current->next;
@ -454,7 +454,7 @@ static unsigned int alloc_pool_region(unsigned int nr_pages)
length=0;
}
}
printk("CRITICAL: Out of non-paged pool space\n");
DbgPrint("CRITICAL: Out of non-paged pool space\n");
for(;;);
return(0);
}