WebSVN – Kolibri OS – Diff – /kernel/trunk/fs/part_set.inc

 ;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1191 $
+$Revision: 1378 $
 ; Mario79
 ; START place
 ;******************************************************
 PARTITION_START      dd 0x3f
 PARTITION_END        dd 0
-fs_type              db 0       ; 0=none, 1=NTFS, 16=FAT16, 32=FAT32
+fs_type              db 0       ; 0=none, 1=NTFS, 2=EXT2/3, 16=FAT16, 32=FAT32
 align 4
 fs_dependent_data_start:
 if $ > fs_dependent_data_end
 ERROR: increase sizeof(fs_dependent_data)!
 end if
 end virtual
+virtual at fs_dependent_data_start
+; EXT2 data
+ext2_data:
+    .log_block_size                 dd ?
+    .block_size                     dd ?
+    .count_block_in_block           dd ?
+    .blocks_per_group               dd ?
+    .inodes_per_group               dd ?
+    .global_desc_table              dd ?
+    .root_inode                     dd ?	; pointer to root inode in memory
+    .inode_size                     dd ?
+    .count_pointer_in_block         dd ?	;  block_size / 4
+    .count_pointer_in_block_square  dd ?	; (block_size / 4)**2
+    .ext2_save_block                dd ?    ; ¡«®ª   £«®¡ «ìãî 1 ¯à®æ¥¤ãàã
+    .ext2_temp_block                dd ?    ; ¡«®ª ¤«ï ¬¥«ª¨å ¯à®æ¥¤ãà
+    .ext2_save_inode                dd ?    ; inode   £«®¡ «ìãî ¯à®æ¥¤ãàã
+    .ext2_temp_inode                dd ?    ; inode ¤«ï ¬¥«ª¨å ¯à®æ¥¤ãà
+if $ > fs_dependent_data_end
+ERROR: increase sizeof(fs_dependent_data)!
+end if
+end virtual
 ;***************************************************************************
 ; End place
 ; Mario79
 ;***************************************************************************
     db    0xcc                  ; DRDOS/secured: fat32, LBA-mapped
     db    0xce                  ; DRDOS/secured: fat16, LBA-mapped
     db    0xd4                  ; Old Multiuser DOS secured: fat16 <32M
     db    0xd6                  ; Old Multiuser DOS secured: fat16 >32M
     db    0x07                  ; NTFS
-    db    0x27                  ; NTFS, hidden
+    db    0x17                  ; NTFS, hidden
+    db    0x83                  ; Linux native file system (ext2fs)
   partition_types_end:
   extended_types_end:
 endg
-; Partition chain used:
-; MBR        ;   PARTITION2 ;   PARTITION3 ;   PARTITION4
-;==========================================================
+; Partition chain used:
-; fat16/32   +-- fat16/32   +-- fat16/32   +-- fat16/32   +--
+; MBR <---------------------
-; extended --+   extended --+   extended --+   extended --+
+; |                         |
-; 0              0              0              0
+; |-> PARTITION1          |
-; 0              0              0              0
-; Notes:
+; |-> EXTENDED PARTITION -        ;not need be second partition
-; - extended partition need to be in second entry on table
+; |-> PARTITION3
+; |-> PARTITION4
 ; - it will skip over removed partitions
 set_PARTITION_variables:
-set_FAT32_variables:
+set_FAT32_variables:        ;deprecated
     mov   [problem_partition],0
     call  reserve_hd1
     call  reserve_hd_channel
     pushad
     cmp   dword [hdpos],0
     je    problem_hd
     xor   ecx,ecx               ; partition count
-    mov   edx,-1                ; flag for partition
+    or    edx,-1                ; flag for partition
-    xor   eax,eax               ; read MBR
+    xor   eax,eax               ; address MBR
     xor   ebp,ebp               ; extended partition start
     jne  problem_hd
     cmp   word [ebx+0x1fe],0xaa55 ; is it valid boot sector?
     jnz   end_partition_chain
-    cmp   dword [ebx+0x1be+0xc],0 ; skip over empty partition
-;    jz    next_partition
+    cmp   dword [ebx+0x1be+0xc],0 ; skip over empty partition
-    jnz    .next_primary_partition
+    jnz    test_primary_partition_0
     cmp   dword [ebx+0x1be+0xc+16],0
-    jnz    next_primary_partition
+    jnz    test_primary_partition_1
     cmp   dword [ebx+0x1be+0xc+16+16],0
-    jnz    next_primary_partition_1
+    jnz    test_primary_partition_2
     cmp   dword [ebx+0x1be+0xc+16+16+16],0
-    jnz    next_primary_partition_2
+    jnz    test_primary_partition_3
-    jmp   next_partition
+    jmp   end_partition_chain
-.next_primary_partition:
+test_primary_partition_0:
     push  eax
     mov   al,[ebx+0x1be+4]      ; get primary partition type
     call  scan_partition_types
     pop   eax
-    jnz   next_primary_partition        ; no. skip over
+    jnz   test_primary_partition_1      ; no. skip over
     inc   ecx
-    cmp   ecx,[fat32part]       ; is it wanted partition?
+    cmp   ecx,[known_part]       ; is it wanted partition?
-    jnz   next_primary_partition        ; no
+    jnz   test_primary_partition_1      ; no
                                         ; when file system data will be available
         mov     dl, [ebx+0x1be+4]
         mov     [fs_type], dl           ; save for FS recognizer (separate FAT vs NTFS)
         pop     edx
-next_primary_partition:
+test_primary_partition_1:
     push  eax
     mov   al,[ebx+0x1be+4+16]      ; get primary partition type
     call  scan_partition_types
     pop   eax
-    jnz   next_primary_partition_1        ; no. skip over
+    jnz   test_primary_partition_2        ; no. skip over
     inc   ecx
-    cmp   ecx,[fat32part]       ; is it wanted partition?
+    cmp   ecx,[known_part]       ; is it wanted partition?
-    jnz   next_primary_partition_1        ; no
+    jnz   test_primary_partition_2        ; no
         mov     edx, eax
         mov     [PARTITION_END], edx
         mov     dl, [ebx+0x1be+4+16]
         mov     [fs_type], dl
         pop     edx
-next_primary_partition_1:
+test_primary_partition_2:
     push  eax
     mov   al,[ebx+0x1be+4+16+16]      ; get primary partition type
     call  scan_partition_types
     pop   eax
-    jnz   next_primary_partition_2        ; no. skip over
+    jnz   test_primary_partition_3        ; no. skip over
     inc   ecx
-    cmp   ecx,[fat32part]       ; is it wanted partition?
+    cmp   ecx,[known_part]       ; is it wanted partition?
-    jnz   next_primary_partition_2        ; no
+    jnz   test_primary_partition_3        ; no
         mov     edx, eax
         mov     [PARTITION_END], edx
         mov     dl, [ebx+0x1be+4+16+16]
         mov     [fs_type], dl
         pop     edx
-next_primary_partition_2:
+test_primary_partition_3:
     push  eax
     mov   al,[ebx+0x1be+4+16+16+16]      ; get primary partition type
     call  scan_partition_types
     pop   eax
-    jnz   next_partition        ; no. skip over
+    jnz   test_ext_partition_0        ; no. skip over
     inc   ecx
-    cmp   ecx,[fat32part]       ; is it wanted partition?
+    cmp   ecx,[known_part]       ; is it wanted partition?
-    jnz   next_partition        ; no
+    jnz   test_ext_partition_0  ; no
         mov     edx, eax
         mov     [PARTITION_END], edx
         mov     dl, [ebx+0x1be+4+16+16+16]
         mov     [fs_type], dl
         pop     edx
-next_partition:
+test_ext_partition_0:
     push  eax
     mov   al,[ebx+0x1be+4]   ; get extended partition type
     call  scan_extended_types
     pop   eax
-    jnz   next_partition_1
+    jnz   test_ext_partition_1
     mov   eax,[ebx+0x1be+8]     ; add relative start
     test  eax,eax               ; is there extended partition?
-    jnz   new_partition         ; yes. read it
+    jnz   new_mbr               ; yes. read it
-next_partition_1:
+test_ext_partition_1:
     push  eax
     mov   al,[ebx+0x1be+4+16]   ; get extended partition type
     call  scan_extended_types
     pop   eax
-    jnz   next_partition_2
+    jnz   test_ext_partition_2
-    mov   eax,[ebx+0x1be+8+16]     ; add relative start
+    mov   eax,[ebx+0x1be+8+16]  ; add relative start
     test  eax,eax               ; is there extended partition?
-    jnz   new_partition         ; yes. read it
+    jnz   new_mbr               ; yes. read it
-next_partition_2:
+test_ext_partition_2:
     push  eax
     mov   al,[ebx+0x1be+4+16+16]   ; get extended partition type
     call  scan_extended_types
     pop   eax
-    jnz   next_partition_3
+    jnz   test_ext_partition_3
     mov   eax,[ebx+0x1be+8+16+16]     ; add relative start
     test  eax,eax               ; is there extended partition?
-    jnz   new_partition         ; yes. read it
+    jnz   new_mbr               ; yes. read it
-next_partition_3:
+test_ext_partition_3:
     push  eax
     mov   al,[ebx+0x1be+4+16+16+16]   ; get extended partition type
     call  scan_extended_types
     pop   eax
         mov     eax, edx
         shr     eax, 1
         add     eax, [PARTITION_START]
         call    hd_read
         cmp     [hd_error], 0
-        jnz     problem_fat_dec_count   ; ¥ áã¤ì¡ ...
+        jnz     problem_fat_dec_count   ; no chance...
 boot_read_ok:
-;        mov     [hd_setup], 0
 ; if we are running on NTFS, check bootsector
-;        cmp     [fs_type], 7
-;        jz      ntfs_setup
-        call    ntfs_test_bootsec
+        call    ntfs_test_bootsec      ; test ntfs
         jnc     ntfs_setup
+        call    ext2_test_superblock   ; test ext2fs
+        jnc	ext2_setup
+        mov	eax, [PARTITION_START]	;ext2 test changes [buffer]
+        call	hd_read
+        cmp     [hd_error], 0
+        jnz	problem_fat_dec_count
     cmp   word [ebx+0x1fe],0xaa55 ; is it valid boot sector?
     jnz   problem_fat_dec_count
     mov   [fatMASK],0x0000FFFF
     mov   [fs_type],16         ; Fat16
     call  free_hd_channel
     mov   [hd1_status],0        ; free
     ret
+>

Subversion Repositories Kolibri OS

(root)/kernel/trunk/fs/part_set.inc – Rev 1191 → 1378