GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix this warning: 

coreboot-v2-4067//src/stream/ide_stream.c: In function 'stream_ide_read':
coreboot-v2-4067//src/stream/ide_stream.c:47: warning: declaration of 'offset' shadows a global declaration
coreboot-v2-4067//src/stream/ide_stream.c:13: warning: shadowed declaration is here

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4071 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2009-04-04 22:27:10 +00:00 committed by Stefan Reinauer
parent dd0b6ff4dd
commit 9f243a1132
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/stream/ide_stream.c
View File

@ -11,6 +11,7 @@
#endif #endif
static unsigned long offset; static unsigned long offset;
int stream_init(void) int stream_init(void)
{ {
int i,res; int i,res;
@ -44,7 +45,8 @@ void stream_fini(void)
static unsigned char buffer[512]; static unsigned char buffer[512];
static unsigned int block_num = 0; static unsigned int block_num = 0;
static unsigned int first_fill = 1; static unsigned int first_fill = 1;
static byte_offset_t stream_ide_read(void *vdest, byte_offset_t offset, byte_offset_t count)
static byte_offset_t stream_ide_read(void *vdest, byte_offset_t offs, byte_offset_t count)
{ {
byte_offset_t bytes = 0; byte_offset_t bytes = 0;
unsigned char *dest = vdest; unsigned char *dest = vdest;
@ -54,14 +56,14 @@ static byte_offset_t stream_ide_read(void *vdest, byte_offset_t offset, byte_off
unsigned int byte_offset, len; unsigned int byte_offset, len;
/* The block is not cached in memory or frist time called */ /* The block is not cached in memory or frist time called */
if (block_num != offset / 512 || first_fill) { if (block_num != offs / 512 || first_fill) {
block_num = offset / 512; block_num = offs / 512;
printk_notice ("."); printk_notice (".");
ide_read(IDE_BOOT_DRIVE, block_num, buffer); ide_read(IDE_BOOT_DRIVE, block_num, buffer);
first_fill = 0; first_fill = 0;
} }
byte_offset = offset % 512; byte_offset = offs % 512;
len = 512 - byte_offset; len = 512 - byte_offset;
if (len > (count - bytes)) { if (len > (count - bytes)) {
len = (count - bytes); len = (count - bytes);
@ -69,7 +71,7 @@ static byte_offset_t stream_ide_read(void *vdest, byte_offset_t offset, byte_off
memcpy(dest, buffer + byte_offset, len); memcpy(dest, buffer + byte_offset, len);
offset += len; offs += len;
bytes += len; bytes += len;
dest += len; dest += len;