aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-04-20 15:56:30 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2009-04-20 15:56:30 -0700
commit31937531087fb47aa4a3a218e8114b32176f8683 (patch)
tree45717a07f96c3053df052e084c06db151f1def84 /memdisk
parentf0e7d4b1ffdd5f636632ac4dd88671410f6dd575 (diff)
downloadsyslinux.git-31937531087fb47aa4a3a218e8114b32176f8683.tar.gz
syslinux.git-31937531087fb47aa4a3a218e8114b32176f8683.tar.xz
syslinux.git-31937531087fb47aa4a3a218e8114b32176f8683.zip
Global whitespace cleanup.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'memdisk')
-rw-r--r--memdisk/setup.c18
-rw-r--r--memdisk/start32.S2
2 files changed, 10 insertions, 10 deletions
diff --git a/memdisk/setup.c b/memdisk/setup.c
index ebc7a36a..61f9bfb5 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -491,7 +491,7 @@ const struct geometry *get_disk_image_geometry(uint32_t where, uint32_t size)
if ( !hd_geometry.h || !hd_geometry.s ) {
int h, s, max_h, max_s;
-
+
max_h = hd_geometry.h;
max_s = hd_geometry.s;
@@ -530,12 +530,12 @@ const struct geometry *get_disk_image_geometry(uint32_t where, uint32_t size)
unsigned int xsectors = sectors;
hd_geometry.driveno = 0; /* Assume floppy */
-
+
while (!ok) {
/* Assume it's a floppy drive, guess a geometry */
unsigned int type, track;
int c, h, s;
-
+
if (xsectors < 320*2) {
c = 40; h = 1; type = 1;
} else if (xsectors < 640*2) {
@@ -573,21 +573,21 @@ const struct geometry *get_disk_image_geometry(uint32_t where, uint32_t size)
/* Assume it is a hard disk image and scan for a partition table */
const struct ptab_entry *ptab = (const struct ptab_entry *)
((char *)where+hd_geometry.offset+(512-2-4*16));
-
+
hd_geometry.driveno = 0x80; /* Assume hard disk */
-
+
if (*(uint16_t *)((char *)where+512-2) == 0xaa55) {
for ( i = 0 ; i < 4 ; i++ ) {
if ( ptab[i].type && !(ptab[i].active & 0x7f) ) {
s = (ptab[i].start_s & 0x3f);
h = ptab[i].start_h + 1;
-
+
if ( max_h < h ) max_h = h;
if ( max_s < s ) max_s = s;
-
+
s = (ptab[i].end_s & 0x3f);
h = ptab[i].end_h + 1;
-
+
if ( max_h < h ) {
max_h = h;
hd_geometry.hsrc = "MBR";
@@ -606,7 +606,7 @@ const struct geometry *get_disk_image_geometry(uint32_t where, uint32_t size)
max_h = xsectors > 2097152 ? 255 : 64;
if (!max_s)
max_s = xsectors > 2097152 ? 63 : 32;
-
+
hd_geometry.h = max_h;
hd_geometry.s = max_s;
}
diff --git a/memdisk/start32.S b/memdisk/start32.S
index 6c88d462..593ffb3e 100644
--- a/memdisk/start32.S
+++ b/memdisk/start32.S
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------
- *
+ *
* Copyright 2003-2009 H. Peter Anvin - All Rights Reserved
* Copyright 2009 Intel Corporation; author: H. Peter Anvin
*