Merge branch 'master' into phcoder/ports/alpha

This commit is contained in:
Vladimir Serbinenko committed 2013-10-25 19:49:21 +02:00
commit f0a52cf8d2
4 files changed
+128 -88

No files matched your search

+3 -3
View File
@@ -37,11 +37,11 @@ GRUB_MOD_LICENSE ("GPLv3+");
Is it a problem?
*/
static void
lba_to_chs (int lba, grub_uint8_t *cl, grub_uint8_t *ch,
lba_to_chs (grub_uint32_t lba, grub_uint8_t *cl, grub_uint8_t *ch,
grub_uint8_t *dh)
{
int cylinder, head, sector;
int sectors = 63, heads = 255, cylinders = 1024;
grub_uint32_t cylinder, head, sector;
grub_uint32_t sectors = 63, heads = 255, cylinders = 1024;
sector = lba % sectors + 1;
head = (lba / sectors) % heads;
+1 -1
View File
@@ -58,7 +58,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
(grub_le_to_cpu32 (data->sblock.log2_block_size) + 10)
/* The size of an ext2 block in bytes. */
#define EXT2_BLOCK_SIZE(data) (1 << LOG2_BLOCK_SIZE (data))
#define EXT2_BLOCK_SIZE(data) (1U << LOG2_BLOCK_SIZE (data))
/* The revision level. */
#define EXT2_REVISION(data) grub_le_to_cpu32 (data->sblock.revision_level)