i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatic whitespace cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32044 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-08-01 01:18:39 +00:00
parent 54897d5c06
commit 1af695be01
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/pxe_ia32/network.cpp
+10 -10
View File
@@ -168,7 +168,7 @@ status_t
UNDI::Init() UNDI::Init()
{ {
TRACE("UNDI::Init\n"); TRACE("UNDI::Init\n");
PXENV_UNDI_GET_INFORMATION get_info; PXENV_UNDI_GET_INFORMATION get_info;
PXENV_UNDI_GET_STATE get_state; PXENV_UNDI_GET_STATE get_state;
PXENV_UNDI_OPEN undi_open; PXENV_UNDI_OPEN undi_open;
@@ -177,8 +177,8 @@ UNDI::Init()
status_t error = PXEService::Init(); status_t error = PXEService::Init();
if (error != B_OK) if (error != B_OK)
return error; return error;
dprintf("client-ip: %lu.%lu.%lu.%lu, server-ip: %lu.%lu.%lu.%lu\n", dprintf("client-ip: %lu.%lu.%lu.%lu, server-ip: %lu.%lu.%lu.%lu\n",
(fClientIP >> 24) & 0xff, (fClientIP >> 16) & 0xff, (fClientIP >> 8) & 0xff, fClientIP & 0xff, (fClientIP >> 24) & 0xff, (fClientIP >> 16) & 0xff, (fClientIP >> 8) & 0xff, fClientIP & 0xff,
(fServerIP >> 24) & 0xff, (fServerIP >> 16) & 0xff, (fServerIP >> 8) & 0xff, fServerIP & 0xff); (fServerIP >> 24) & 0xff, (fServerIP >> 16) & 0xff, (fServerIP >> 8) & 0xff, fServerIP & 0xff);
@@ -198,16 +198,16 @@ UNDI::Init()
dprintf("PXENV_UNDI_GET_STATE failed, res %x, status %x, ignoring\n", res, get_state.Status); dprintf("PXENV_UNDI_GET_STATE failed, res %x, status %x, ignoring\n", res, get_state.Status);
} else { } else {
switch (get_state.UNDIstate) { switch (get_state.UNDIstate) {
case PXE_UNDI_GET_STATE_STARTED: case PXE_UNDI_GET_STATE_STARTED:
TRACE("PXE_UNDI_GET_STATE_STARTED\n"); TRACE("PXE_UNDI_GET_STATE_STARTED\n");
break; break;
case PXE_UNDI_GET_STATE_INITIALIZED: case PXE_UNDI_GET_STATE_INITIALIZED:
TRACE("PXE_UNDI_GET_STATE_INITIALIZED\n"); TRACE("PXE_UNDI_GET_STATE_INITIALIZED\n");
break; break;
case PXE_UNDI_GET_STATE_OPENED: case PXE_UNDI_GET_STATE_OPENED:
TRACE("PXE_UNDI_GET_STATE_OPENED\n"); TRACE("PXE_UNDI_GET_STATE_OPENED\n");
break; break;
default: default:
TRACE("unknown undi state 0x%02x\n", get_state.UNDIstate); TRACE("unknown undi state 0x%02x\n", get_state.UNDIstate);
break; break;
} }
@@ -229,7 +229,7 @@ UNDI::Init()
TRACE("TxBufCt = %x\n", get_info.TxBufCt); TRACE("TxBufCt = %x\n", get_info.TxBufCt);
fMACAddress = get_info.CurrentNodeAddress; fMACAddress = get_info.CurrentNodeAddress;
TRACE("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", fMACAddress[0], fMACAddress[1], fMACAddress[2], fMACAddress[3], fMACAddress[4], fMACAddress[5]); TRACE("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", fMACAddress[0], fMACAddress[1], fMACAddress[2], fMACAddress[3], fMACAddress[4], fMACAddress[5]);
return B_OK; return B_OK;
@@ -313,7 +313,7 @@ UNDI::Receive(void *buffer, size_t size)
fRxFinished = true; fRxFinished = true;
return 0; return 0;
} }
} else { } else {
undi_isr.FuncFlag = PXENV_UNDI_ISR_IN_START; undi_isr.FuncFlag = PXENV_UNDI_ISR_IN_START;
@@ -332,7 +332,7 @@ UNDI::Receive(void *buffer, size_t size)
// send EOI to pic ? // send EOI to pic ?
// TRACE("PXENV_UNDI_ISR_OUT_OURS\n"); // TRACE("PXENV_UNDI_ISR_OUT_OURS\n");
undi_isr.FuncFlag = PXENV_UNDI_ISR_IN_PROCESS; undi_isr.FuncFlag = PXENV_UNDI_ISR_IN_PROCESS;
res = call_pxe_bios(fPxeData, UNDI_ISR, &undi_isr); res = call_pxe_bios(fPxeData, UNDI_ISR, &undi_isr);
if (res != 0 || undi_isr.Status != 0) { if (res != 0 || undi_isr.Status != 0) {
src/system/boot/platform/pxe_ia32/pxe_stage1.S
+7 -7
View File
@@ -60,7 +60,7 @@ _start:
cld cld
// print start banner // print start banner
movw $startmsg, %si movw $startmsg, %si
call puts call puts
@@ -77,7 +77,7 @@ _start:
call puts call puts
// switch to unreal mode // switch to unreal mode
cli cli
call enable_a20 call enable_a20
call go_unreal call go_unreal
sti sti
@@ -161,7 +161,7 @@ _start:
movw $crlf, %si movw $crlf, %si
call puts call puts
// handle DHCP options..... // handle DHCP options.....
movw $PXENV_GET_CACHED_INFO, %bx movw $PXENV_GET_CACHED_INFO, %bx
movw $s_PXENV_GET_CACHED_INFO_2, %di movw $s_PXENV_GET_CACHED_INFO_2, %di
lcall * pxenv_api lcall * pxenv_api
@@ -198,7 +198,7 @@ _start:
call puts call puts
movw $crlf, %si movw $crlf, %si
call puts call puts
// get file size // get file size
movl server_ip, %eax movl server_ip, %eax
movl %eax, s_PXENV_TFTP_GET_FSIZE_ServerIPAddress movl %eax, s_PXENV_TFTP_GET_FSIZE_ServerIPAddress
@@ -244,7 +244,7 @@ _start:
movw s_PXENV_TFTP_OPEN_PacketSize, %ax movw s_PXENV_TFTP_OPEN_PacketSize, %ax
imull $65535, %eax imull $65535, %eax
movl %eax, max_fsize movl %eax, max_fsize
// print max TFTP file size // print max TFTP file size
movw $maxfsize, %si movw $maxfsize, %si
call puts call puts
@@ -382,7 +382,7 @@ err_fsize:
movw $sizefailed, %si movw $sizefailed, %si
call puts call puts
jmp stop jmp stop
err_load: err_load:
movw $loadfailed, %si movw $loadfailed, %si
call puts call puts
@@ -401,7 +401,7 @@ _puts2: lodsb
ret ret
putc: movw $0x7, %bx putc: movw $0x7, %bx
movb $0xe, %ah movb $0xe, %ah
int $0x10 int $0x10
jmp _puts2 jmp _puts2
puthex32: puthex32:
src/system/boot/platform/pxe_ia32/pxe_stage2.S
+2 -2
View File
@@ -39,12 +39,12 @@ pxe_start:
cld cld
// print start banner // print start banner
mov $kStartMessage + INITIAL_LOAD_OFFSET, %esi mov $kStartMessage + INITIAL_LOAD_OFFSET, %esi
call puts call puts
// switch to unreal mode // switch to unreal mode
cli cli
call enable_a20 call enable_a20
call go_unreal call go_unreal
sti sti