WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/blkdev/disk.inc

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2011-2012. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2011-2014. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 DISK_STATUS_OK              = 0 ; success
 DISK_STATUS_GENERAL_ERROR   = -1; if no other code is suitable
 DISK_STATUS_INVALID_CALL    = 1 ; invalid input parameters
 DISK_STATUS_NO_MEDIA        = 2 ; no media present
 DISK_STATUS_END_OF_MEDIA    = 3 ; end of media while reading/writing data
+DISK_STATUS_NO_MEMORY       = 4 ; insufficient memory for driver operation
 ; Driver flags. Represent bits in DISK.DriverFlags.
 DISK_NO_INSERT_NOTIFICATION = 1
 ; Media flags. Represent bits in DISKMEDIAINFO.Flags.
 DISK_MEDIA_READONLY = 1
 ; This structure represents the disk cache. To follow the old implementation,
 ; there are two distinct caches for a disk, one for "system" data,and the other
 ; for "application" data.
-struct  DISKCACHE
-        mutex           MUTEX
-; Lock to protect the cache.
+struct  DISKCACHE
 ; The following fields are inherited from data32.inc:cache_ideX.
         pointer         dd ?
         data_size       dd ?    ; unused
         data            dd ?
         sad_size        dd ?
+        search_start    dd ?
-        search_start    dd ?
+        sector_size_log dd ?
 ends
 ; This structure represents a disk device and its media for the kernel.
 ; Number of partitions on this media.
         Partitions      dd ?
 ; Pointer to array of .NumPartitions pointers to PARTITION structures.
         cache_size      dd ?
 ; inherited from cache_ideX_size
+        CacheLock       MUTEX
+; Lock to protect both caches.
         SysCache        DISKCACHE
         AppCache        DISKCACHE
 ; Two caches for the disk.
 ends
 ;   filesystem operations are referencing the same filesystem data, this is
 ;   better resolved at the level of the filesystem.
 endg
 iglobal
-; The function 'disk_scan_partitions' needs three 512-byte buffers for
+; The function 'disk_scan_partitions' needs three sector-sized buffers for
 ; MBR, bootsector and fs-temporary sector data. It can not use the static
 ; buffers always, since it can be called for two or more disks in parallel.
 ; However, this case is not typical. We reserve three static 512-byte buffers
 ; and a flag that these buffers are currently used. If 'disk_scan_partitions'
 ; detects that the buffers are currently used, it allocates buffers from the
-; heap.
+; heap. Also, the heap is used when sector size is other than 512.
 ; The flag is implemented as a global dword variable. When the static buffers
 ; are not used, the value is -1. When the static buffers are used, the value
 ; is normally 0 and temporarily can become greater. The function increments
 ; this value. If the resulting value is zero, it uses the buffers and
 ; esi = pointer to the DISK structure.
 disk_scan_partitions:
 ; 1. Initialize .NumPartitions and .Partitions fields as zeros: empty list.
         and     [esi+DISK.NumPartitions], 0
         and     [esi+DISK.Partitions], 0
-; 2. Currently we can work only with 512-bytes sectors. Check this restriction.
-; The only exception is 2048-bytes CD/DVD, but they are not supported yet by
-; this code.
-        cmp     [esi+DISK.MediaInfo.SectorSize], 512
-        jz      .doscan
-        DEBUGF 1,'K : sector size is %d, only 512 is supported\n',[esi+DISK.MediaInfo.SectorSize]
-        ret
-.doscan:
-; 3. Acquire the buffer for MBR and bootsector tests. See the comment before
+; 2. Acquire the buffer for MBR and bootsector tests. See the comment before
 ; the 'partition_buffer_users' variable.
+        mov     eax, [esi+DISK.MediaInfo.SectorSize]
+        cmp     eax, 512
+        jnz     @f
         mov     ebx, mbr_buffer         ; assume the global buffer is free
         lock inc [partition_buffer_users]
         jz      .buffer_acquired        ; yes, it is free
         lock dec [partition_buffer_users]       ; no, we must allocate
+@@:
+        lea     eax, [eax*3]
-        stdcall kernel_alloc, 512*3
+        stdcall kernel_alloc, eax
         test    eax, eax
         jz      .nothing
         xchg    eax, ebx
 .buffer_acquired:
 ; MBR/EBRs are organized in the chain. We use a loop over MBR/EBRs, but no
 ; more than MAX_NUM_PARTITION times.
-; 4. Prepare things for the loop.
+; 3. Prepare things for the loop.
 ; ebp will hold the sector number for current MBR/EBR.
 ; [esp] will hold the sector number for current extended partition, if there
 ; is one.
 ; [esp+4] will hold the counter that prevents long loops.
         push    ebp             ; save ebp
         push    MAX_NUM_PARTITIONS      ; the counter of max MBRs to process
         xor     ebp, ebp        ; start from sector zero
         push    ebp             ; no extended partition yet
+; 4. MBR is 512 bytes long. If sector size is less than 512 bytes,
+; assume no MBR, no partitions and go to 10.
+        cmp     [esi+DISK.MediaInfo.SectorSize], 512
+        jb      .notmbr
 .new_mbr:
 ; 5. Read the current sector.
 ; Note that 'read' callback operates with 64-bit sector numbers, so we must
 ; push additional zero as a high dword of sector number.
         mov     al, DISKFUNC.read
 ; 1. Read the bootsector to the buffer.
 ; When disk_add_partition is called, ebx contains a pointer to
 ; a three-sectors-sized buffer. This function saves ebx in the stack
 ; immediately before ebp.
         mov     ebx, [ebp-4] ; get buffer
-        add     ebx, 512     ; advance over MBR data to bootsector data
+        add     ebx, [esi+DISK.MediaInfo.SectorSize] ; advance over MBR data to bootsector data
         add     ebp, 8       ; ebp points to part of PARTITION structure
         xor     eax, eax     ; first sector of the partition
         call    fs_read32_sys
         push    eax
 ; 2. Run tests for all supported filesystems. If at least one test succeeded,
 ; go to 4.
 ; For tests:
 ; ebp -> first three fields of PARTITION structure, .start, .length, .disk;
 ; [esp] = error code after bootsector read: 0 = ok, otherwise = failed,
 ; ebx points to the buffer for bootsector,
-; ebx+512 points to 512-bytes buffer that can be used for anything.
+; ebx+[esi+DISK.MediaInfo.SectorSize] points to sector-sized buffer that can be used for anything.
         call    fat_create_partition
         test    eax, eax
         jnz     .success
         call    ntfs_create_partition
         test    eax, eax

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/blkdev/disk.inc – Rev 4287 → 5201