From: John Hodge Date: Sat, 7 May 2011 13:39:55 +0000 (+0800) Subject: Upgraded BochsGA to new specs, formatting change in ext2fs X-Git-Tag: rel0.10~117 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=bdf8cdf9a8f0c825bf42f5ff25dce39180b039a0;p=tpg%2Facess2.git Upgraded BochsGA to new specs, formatting change in ext2fs --- diff --git a/Modules/Display/BochsGA/bochsvbe.c b/Modules/Display/BochsGA/bochsvbe.c index 3c8309e1..b1b2e22e 100644 --- a/Modules/Display/BochsGA/bochsvbe.c +++ b/Modules/Display/BochsGA/bochsvbe.c @@ -184,7 +184,7 @@ Uint64 BGA_Write(tVFS_Node *node, Uint64 off, Uint64 len, void *Buffer) { VT_Font_Render( chars->Ch, - dest + x*giVT_CharWidth, gpBGA_CurrentMode->width, + dest + x*giVT_CharWidth, 32, gpBGA_CurrentMode->width*4, VT_Colour12to24(chars->BGCol), VT_Colour12to24(chars->FGCol) ); diff --git a/Modules/Filesystems/Ext2/ext2fs.h b/Modules/Filesystems/Ext2/ext2fs.h index 0cc9a466..a3aa301e 100644 --- a/Modules/Filesystems/Ext2/ext2fs.h +++ b/Modules/Filesystems/Ext2/ext2fs.h @@ -52,14 +52,17 @@ struct ext2_super_block_s { Uint32 s_blocks_count; //!< Blocks count Uint32 s_r_blocks_count; //!< Reserved blocks count Uint32 s_free_blocks_count; //!< Free blocks count + Uint32 s_free_inodes_count; //!< Free inodes count Uint32 s_first_data_block; //!< First Data Block Uint32 s_log_block_size; //!< Block size Sint32 s_log_frag_size; //!< Fragment size + Uint32 s_blocks_per_group; //!< Number Blocks per group Uint32 s_frags_per_group; //!< Number Fragments per group Uint32 s_inodes_per_group; //!< Number Inodes per group Uint32 s_mtime; //!< Mount time + Uint32 s_wtime; //!< Write time Uint16 s_mnt_count; //!< Mount count Sint16 s_max_mnt_count; //!< Maximal mount count @@ -67,10 +70,12 @@ struct ext2_super_block_s { Uint16 s_state; //!< File system state Uint16 s_errors; //!< Behaviour when detecting errors Uint16 s_pad; //!< Padding + Uint32 s_lastcheck; //!< time of last check Uint32 s_checkinterval; //!< max. time between checks Uint32 s_creator_os; //!< Formatting OS Uint32 s_rev_level; //!< Revision level + Uint16 s_def_resuid; //!< Default uid for reserved blocks Uint16 s_def_resgid; //!< Default gid for reserved blocks Uint32 s_reserved[235]; //!< Padding to the end of the block