patch-2.4.22 linux-2.4.22/arch/mips/hp-lj/utils.c
Next file: linux-2.4.22/arch/mips/ite-boards/generic/Makefile
Previous file: linux-2.4.22/arch/mips/hp-lj/setup.c
Back to the patch index
Back to the overall index
- Lines: 40
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/hp-lj/utils.c
- Orig date:
2002-08-02 17:39:43.000000000 -0700
diff -urN linux-2.4.21/arch/mips/hp-lj/utils.c linux-2.4.22/arch/mips/hp-lj/utils.c
@@ -20,11 +20,11 @@
unsigned long cfg[10],i,total_mem=0;
- for(i=0;i<10;i++)
- cfg[i] = *miu_chan_cfg(i);
+ for(i=0;i<10;i++)
+ cfg[i] = *miu_chan_cfg(i);
for(i=0;i<10;i++){
- if(cfg[i]==0x1fc160c2) continue; // skip empties
+ if(cfg[i]==0x1fc160c2) continue; // skip empties
if( ( (cfg[i]>>12) & 0xf ) <= 0xb ) continue; // skip roms
total_mem += mbsize[(cfg[i]>>16)&0x7] *1024*1024;
}
@@ -43,19 +43,19 @@
#define MIN_GEN_MEM (4 << 20)
-
-void reserve_buffer(const char* cl, ulong base_mem)
+
+void reserve_buffer(const char* cl, ulong base_mem)
{
char* pos = strstr(cl, "reserved_buffer=");
if (pos) {
- buffer_size = simple_strtol(pos+strlen("reserved_buffer="),
+ buffer_size = simple_strtol(pos+strlen("reserved_buffer="),
0, 10);
buffer_size <<= 20;
if (buffer_size + MIN_GEN_MEM > base_mem)
buffer_size = base_mem - MIN_GEN_MEM;
- if (buffer_size > 0)
+ if (buffer_size > 0)
buffer_ptr = (ulong*)(base_mem - buffer_size);
- else
+ else
buffer_size = 0;
}
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)