aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-12-28 16:13:41 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-12-28 16:13:41 -0800
commitf491a01cbac0ecc7eb072d2caeac2d529091eb9b (patch)
tree366c96fe9bf5384384f6bd233206aea3f0af0752
parent16aa8de721413236e9c6c212133b53ceb39887bf (diff)
parentcd5188bc5c189b6d374ccd4cd5eeba0d9f718ae1 (diff)
downloadsyslinux.git-f491a01cbac0ecc7eb072d2caeac2d529091eb9b.tar.gz
syslinux.git-f491a01cbac0ecc7eb072d2caeac2d529091eb9b.tar.xz
syslinux.git-f491a01cbac0ecc7eb072d2caeac2d529091eb9b.zip
Merge commit 'contrib/master'
-rw-r--r--memdisk/memdisk.inc2
-rw-r--r--memdisk/setup.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/memdisk/memdisk.inc b/memdisk/memdisk.inc
index a92bbda2..e1a0901b 100644
--- a/memdisk/memdisk.inc
+++ b/memdisk/memdisk.inc
@@ -938,7 +938,7 @@ writehex_common:
ret
%endif
- section .data
+ section .data align=16
alignb 2
Int13Funcs dw Reset ; 00h - RESET
dw GetStatus ; 01h - GET STATUS
diff --git a/memdisk/setup.c b/memdisk/setup.c
index ea17afda..b8eadfb7 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -592,7 +592,7 @@ static const struct geometry *get_disk_image_geometry(uint32_t where,
while (!ok) {
/* Assume it's a floppy drive, guess a geometry */
unsigned int type, track;
- int c, h, s;
+ int c, h, s = 0;
if (xsectors < 320 * 2) {
c = 40;
@@ -795,7 +795,7 @@ static void relocate_rm_code(uint32_t newbase)
static uint8_t checksum_buf(const void *buf, int count)
{
const uint8_t *p = buf;
- uint8_t c;
+ uint8_t c = 0;
while (count--)
c += *p++;