WebSVN – Kolibri OS – Diff – /kernel/branches/gfx_kernel/fs/fs.inc

 ;;                                                                      ;;
 ;; System service for filesystem call                                   ;;
 ;; (C) 2004 Ville Turjanmaa, License: GPL                               ;;
 ;; 29.04.2006 Elimination of hangup after the                           ;;
 ;;            expiration hd_wait_timeout (for LBA) -  Mario79           ;;
-;; xx.04.2006 LFN support - diamond                                     ;;
 ;; 15.01.2005 get file size/attr/date, file_append (only for hd) - ATV  ;;
 ;; 23.11.2004 test if hd/partition is set - ATV                         ;;
 ;; 18.11.2004 get_disk_info and more error codes - ATV                  ;;
 ;; 08.11.2004 expand_pathz and rename (only for hd) - ATV               ;;
 ;; 20.10.2004 Makedir/Removedir (only for hd) - ATV                     ;;
 ; IN:
+;
 ; eax = 0  ; read file          /RamDisk/First  6
-; eax = 1  ; write file         /RamDisk/First 33   /HardDisk/First 56
-; eax = 2  ; delete file        /RamDisk/First 32
-; eax = 4  ; makedir
-; eax = 5  ; rename file/directory
+; eax = 1  ; write file         /RamDisk/First 33   /HardDisk/First 56
 ; eax = 8  ; lba read
-; eax = 15 ; get_disk_info
-; eax = 16 ; start application
+; eax = 15 ; get_disk_info
+;
 ; OUT:
+;
 ; eax = 0  : read ok
     ; Extract parameters
     add    eax, std_application_base_address    ; abs start of info block
     cmp   dword [eax+0],15      ; GET_DISK_INFO
-    je    fs_info
-    cmp   dword [eax+0],16      ; RUN - dont care about read&write blocks
-    je    fs_read
-    cmp   dword [eax+0],5       ; RENAME - dont care about read&write blocks
-    je    fs_read
-    cmp   dword [eax+0],4       ; MAKEDIR - dont care about read&write blocks
-    je    fs_read
-    cmp   dword [eax+0],2       ; DELETE - dont care about read&write blocks
-    je    fs_read
+    je    fs_info
-    cmp   dword [0x3000],1      ; no memory checks for kernel requests
+    cmp   dword [CURRENT_TASK],1      ; no memory checks for kernel requests
     jz    no_checks_for_kernel
     mov   edx,eax
     cmp   dword [eax+0],1
 ; root - only read is allowed
 ; other operations return "access denied", eax=10
 ; (execute operation returns eax=-10)
     cmp    dword [eax], 0
     jz    .read_root
-    mov    ecx, 10
-    cmp    dword [eax], 16
+    mov    dword [esp+36], 10
-    jnz    @f
-    neg    ecx
-@@:    mov    [esp+36], ecx
     ret
 .read_root:
 ; \end{diamond}[18.03.2006]
     mov   esi,dir0
     mov   edi,[eax+12]
     ; eax=0 ok - eax=1 not enough free space
     jmp   file_system_return
-  fs_noramdisk_write:
-    cmp   dword [esp+20],16     ; START APPLICATION
-    jne   fs_noramdisk_start_application
-    mov   eax,[esp+4]           ; fname
-    add   eax,2*12+1
-    xor   ebx,ebx               ; parameters to pass
-    cmp   dword [esp+12],ebx;0
-    je    no_fl_start_param
-    mov   ebx, [esp+12]
-    add   ebx, std_application_base_address
-  no_fl_start_param:
-    mov   edx,[esp+16]        ; flags
-    call  start_application_fl
-    jmp   file_system_startapp_return
-  fs_noramdisk_start_application:     ;there's new code - Mihasik
-    cmp   dword [esp+20],2      ;DELETE
-    jne   fs_noramdisk_delete
-    mov   eax,[esp+4]           ; fname
-    add   eax,2*12+1
-    call  filedelete
-    jmp   file_system_return
-  fs_noramdisk_delete:
+  fs_noramdisk_write:
   fs_noramdisk:
     jmp   file_system_return
-  fs_noflpdisk_write:
-    cmp   dword [esp+20],2      ; DELETE
-    jne   fs_noflpdisk_delete
-    mov   eax,[esp+4]           ; fname
-    add   eax,2*12+1
-    call  floppy_filedelete
-    mov   [flp_status],0
-    jmp   file_system_return
-  fs_noflpdisk_delete:
-    cmp   dword [esp+20],16     ; START APPLICATION
-    jne   fs_noflpdisk_start_application
-    mov   eax,[esp+4]           ; fname
-    add   eax,2*12+1
-    xor   ebx,ebx               ; parameters to pass
-    cmp   dword [esp+12],ebx;0
-    je    no_flp_start_param
-    mov   ebx,[0x3010]
-    mov   ebx,[ebx+0x10]
-    add   ebx,[esp+12]
-  no_flp_start_param:
-    mov   edx,[esp+16]        ; flags
-    call  start_application_floppy
-file_system_startapp_return:
-    mov    ebx, [esp+24+24]    ; do not modify ebx in application
-    jmp   file_system_return
-  fs_noflpdisk_start_application:
+  fs_noflpdisk_write:
   fs_noflpdisk:
      call  reserve_hd1
      mov  [hdbase],0x170
      mov  [hdid],0x10
      mov  [hdpos],4
 fs_yesharddisk_partition:
+        call    reserve_hd_channel
 ;    call  choice_necessity_partition
 ;    jmp   fs_yesharddisk_all
     jmp   fs_for_new_semantic
  fs_for_new_semantic:
     call  choice_necessity_partition
   fs_yesharddisk_all:
-    mov   eax,1
-    cmp    dword [esp+20], 16
-    jnz    @f
-    neg    eax
+    mov   eax,1
-@@:    mov    ebx, [esp+24+24]
+    mov    ebx, [esp+24+24]
     cmp   [hdpos],0             ; is hd base set?
     jz    hd_err_return
     cmp   [fat32part],0         ; is partition set?
     jnz   @f
+hd_err_return:
-hd_err_return:
+    call  free_hd_channel
     and   [hd1_status], 0
     jmp   file_system_return
 @@:
     call  file_read
     mov   edi,[esp+0]
+    mov   byte [edi],'/'
-    mov   byte [edi],'/'
+    call  free_hd_channel
     and   [hd1_status], 0
     mov   edi,[esp+0]
     mov   byte [edi],'/'
+    ; eax=0 ok - eax=1 not enough free space
-    ; eax=0 ok - eax=1 not enough free space
+    call  free_hd_channel
     and   [hd1_status], 0
-    jmp   file_system_return
-  fs_noharddisk_write:
-    cmp   dword [esp+20],2      ; DELETE
-    jne   fs_noharddisk_delete
-    mov   eax,[esp+0]           ; /dirname or /filename
-    mov   byte [eax],0          ; path to asciiz
-    inc   eax                   ; filename start
-    mov   edx,[esp+4]
-    add   edx,12*2              ; path start
-    call  removedir
-    mov   edi,[esp+0]
-    mov   byte [edi],'/'
-    jmp   file_system_return
-  fs_noharddisk_delete:
-    cmp   dword [esp+20],4      ; MAKEDIR
-    jne   fs_noharddisk_makedir
-    mov   eax,[esp+0]           ; /dirname
-    mov   byte [eax],0          ; path to asciiz
-    inc   eax                   ; filename start
-    mov   edx,[esp+4]
-    add   edx,12*2              ; path start
-    call  makedir
-    mov   edi,[esp+0]
-    mov   byte [edi],'/'
-    jmp   file_system_return
-  fs_noharddisk_makedir:
-    cmp   dword [esp+20],5      ; RENAME
-    jne   fs_noharddisk_rename
-    mov   edi,[esp+0]           ; start of source file name
-    add   edi,12+1              ; continue after name
-    call  expand_pathz          ; convert destination name
-    mov   eax,[edi+1]
-    cmp   eax,'HD  '
-    je    fs_rename_test1
-    cmp   eax,'HARD'
-    jne   fs_rename_error
-  fs_rename_test1:
-    mov   eax,[edi+1+12]
-    cmp   eax,'1   '
-    je    fs_rename_start
-    cmp   eax,'FIRS'
-    jne   fs_rename_error
-  fs_rename_start:
-    mov   byte [ebx],0          ; path to asciiz
-    inc   ebx                   ; filename start
-    add   edi,12*2              ; path start
-    cmp   byte [ebx],0
-    je    fs_rename_error
-    cmp   byte [ebx],32
-    je    fs_rename_error
-    mov   eax,[esp+0]           ; /filename
+    jmp   file_system_return
-    mov   byte [eax],0          ; path to asciiz
-    inc   eax                   ; filename start
-    mov   edx,[esp+4]
-    add   edx,12*2              ; path start
-    call  rename
-    mov   edi,[esp+0]
-    mov   byte [edi],'/'
-    jmp   file_system_return
-  fs_rename_error:
-    mov   eax,4                 ; partition not defined at hd
-    jmp   file_system_return
-  fs_noharddisk_rename:
-    cmp   dword [esp+20],16     ; START APPLICATION
-    jne   fs_noharddisk_start_application
-    mov   eax,[esp+4]           ; fname
-    add   eax,12*2
-    mov   ebx,[esp+0]           ; length
-    sub   ebx,eax
-    add   ebx,12
-    mov   ecx,[esp+4]           ; work area
-    add   ecx,512
-    xor   ebp,ebp               ; parameters to pass
-    cmp   dword [esp+12],ebp;0
-    je    no_hd_start_param
-    mov   ebp, [esp+12]
-    add   ebp, std_application_base_address
-  no_hd_start_param:
-    mov   edx,[esp+16]        ; flags
-    call  start_application_hd
+  fs_noharddisk_write:
     jmp   file_system_startapp_return
-  fs_noharddisk_start_application:
-  fs_noharddisk:
+    call  free_hd_channel
-; \begin{diamond}[18.03.2006]
+    and   [hd1_status], 0
     mov    eax, 5        ; file not found
-; à ìîæåò áûòü, âîçâðàùàòü äðóãîé êîä îøèáêè?
+  fs_noharddisk:
 ; (execute operation returns eax=-10)
     cmp    dword [esp+20], 0
     jz    .read
     add    esp, 20
     pop    ecx
-    mov    eax, 10
-    cmp    ecx, 16
-    jnz    @f
-    neg    eax
-@@:    mov    [esp+36], eax
+    mov    dword [esp+36], 10
     ret
 .read:
 ; \end{diamond}[18.03.2006]
     mov   al,0x10
     mov   ebx,1
     mov   edi,ecx
     mov   esi,eax
     shl   esi,9
-    add   esi,0x100000
+    add   esi,RAMDISK
     mov   ecx,512/4
 ;    cld

Subversion Repositories Kolibri OS

(root)/kernel/branches/gfx_kernel/fs/fs.inc – Rev 133 → 384