From 48bd92cda25b818f8805c9d5cb366292d3f18a3e Mon Sep 17 00:00:00 2001 From: Andrew Dent Date: Thu, 30 May 2024 21:16:43 +0000 Subject: [PATCH] Fix EN comments in kernel - Minor tweaks. - Includes work by @rgimad. git-svn-id: svn://kolibrios.org@10069 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/blkdev/ahci.inc | 12 ++++++------ kernel/trunk/blkdev/disk_cache.inc | 4 ++-- kernel/trunk/blkdev/fdc.inc | 8 ++++---- kernel/trunk/blkdev/hd_drv.inc | 8 ++++---- kernel/trunk/blkdev/rd.inc | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kernel/trunk/blkdev/ahci.inc b/kernel/trunk/blkdev/ahci.inc index 6b71c30ec6..0ee732ccf2 100644 --- a/kernel/trunk/blkdev/ahci.inc +++ b/kernel/trunk/blkdev/ahci.inc @@ -44,7 +44,7 @@ bit_AHCI_HBA_CAP2_BOH = 0 ; Supports BIOS/OS Handoff bit_AHCI_HBA_BOHC_BOS = 0 ; BIOS-Owned Semaphore (BIOS owns controller) bit_AHCI_HBA_BOHC_OOS = 1 ; OS-Owned Semaphore (OS owns controller) -bit_AHCI_HBA_BOHC_BB = 4 ; BIOS Busy (polling bit while BIOS cleans up +bit_AHCI_HBA_BOHC_BB = 4 ; BIOS Busy (polling bit while BIOS cleans up) bit_AHCI_HBA_GHC_AHCI_ENABLE = 31 ; Enable AHCI mode bit_AHCI_HBA_GHC_RESET = 0 ; Reset HBA @@ -167,7 +167,7 @@ struct PORT_DATA ctr_ptr dd ? ; pointer to controller to which port belongs ends -; Register FIS – Host to Device +; Register FIS - Host to Device struct FIS_REG_H2D fis_type db ? ; FIS_TYPE_REG_H2D flags db ? ; 0bCRRRPPPP, C - 1: Command, 0: Control @@ -194,7 +194,7 @@ struct FIS_REG_H2D rb 4 ; Reserved ends -; Register FIS – Device to Host +; Register FIS - Device to Host struct FIS_REG_D2H fis_type db ? ; FIS_TYPE_REG_D2H @@ -221,7 +221,7 @@ struct FIS_REG_D2H rb 4 ; Reserved ends -; Data FIS – Bidirectional +; Data FIS - Bidirectional struct FIS_DATA fis_type db ? ; FIS_TYPE_DATA flags db ? ; 0bRRRRPPPP, R - Reserved, P - Port multiplier @@ -230,7 +230,7 @@ struct FIS_DATA data rd 1 ; Payload ends -; PIO Setup – Device to Host +; PIO Setup - Device to Host struct FIS_PIO_SETUP fis_type db ? ; FIS_TYPE_PIO_SETUP @@ -259,7 +259,7 @@ struct FIS_PIO_SETUP rb 2 ; Reserved ends -; DMA Setup – Device to Host +; DMA Setup - Device to Host struct FIS_DMA_SETUP fis_type db ? ; FIS_TYPE_DMA_SETUP flags db ? ; 0bAIDRPPPP, A - Auto-activate. Specifies if DMA Activate FIS is needed, diff --git a/kernel/trunk/blkdev/disk_cache.inc b/kernel/trunk/blkdev/disk_cache.inc index 765a0102bc..69b6418bf4 100644 --- a/kernel/trunk/blkdev/disk_cache.inc +++ b/kernel/trunk/blkdev/disk_cache.inc @@ -16,8 +16,8 @@ ; allocated/freed sector-wise, so items for sequential sectors can be ; scattered over all the cache. ; So read/write functions allocate a temporary buffer which is -; 1) not greater than half of free memory and -; 2) not greater than the following constant. +; (1) not greater than half of free memory and +; (2) not greater than the following constant. CACHE_MAX_ALLOC_SIZE = 4 shl 20 ; Legacy interface for filesystems fs_{read,write}32_{sys,app} diff --git a/kernel/trunk/blkdev/fdc.inc b/kernel/trunk/blkdev/fdc.inc index 2c6702c58b..cb9bdd6900 100644 --- a/kernel/trunk/blkdev/fdc.inc +++ b/kernel/trunk/blkdev/fdc.inc @@ -11,7 +11,7 @@ uglobal dmamode db 0x0 endg -fdc_init: ;start with clean tracks. +fdc_init: ; start with clean tracks mov edi, OS_BASE+0xD201 mov al, 0 mov ecx, 160 @@ -28,9 +28,9 @@ save_image: call floppy_read_bootsector cmp [FDC_Status], 0 jne .unnecessary_save_image - mov [FDD_Track], 0; Цилиндр - mov [FDD_Head], 0; Сторона - mov [FDD_Sector], 1; Сектор + mov [FDD_Track], 0 + mov [FDD_Head], 0 + mov [FDD_Sector], 1 mov esi, RAMDISK call SeekTrack .save_image_1: diff --git a/kernel/trunk/blkdev/hd_drv.inc b/kernel/trunk/blkdev/hd_drv.inc index f89c57b1a0..d22d29b05a 100644 --- a/kernel/trunk/blkdev/hd_drv.inc +++ b/kernel/trunk/blkdev/hd_drv.inc @@ -505,16 +505,16 @@ IDE_common_irq_handler: ; Most of the time, we are here because we have requested ; a DMA transfer for the corresponding drive. ; However, -; a) we can be here because IDE IRQ is shared with some other device, +; (a) we can be here because IDE IRQ is shared with some other device, ; that device has actually raised IRQ, ; it has nothing to do with IDE; -; b) we can be here because IDE controller just does not want +; (b) we can be here because IDE controller just does not want ; to be silent and reacts to something even though ; we have, in theory, disabled IRQs. ; If the interrupt corresponds to our current request, ; remove the interrupt request and raise the event for the waiting code. -; In the case a), just return zero - not our interrupt. -; In the case b), remove the interrupt request and hope for the best. +; In the case (a), just return zero - not our interrupt. +; In the case (b), remove the interrupt request and hope for the best. ; DEBUGF 1, 'K : IDE_irq_handler %x\n', [IDE_common_irq_param]:2 mov ecx, [esp+4] mov dx, [ecx+IDE_DATA.RegsBaseAddres] diff --git a/kernel/trunk/blkdev/rd.inc b/kernel/trunk/blkdev/rd.inc index 9b076e2e89..78cab2e4a5 100644 --- a/kernel/trunk/blkdev/rd.inc +++ b/kernel/trunk/blkdev/rd.inc @@ -41,8 +41,8 @@ endg mov ebx, eax stdcall disk_media_changed, eax, 1 ; 2. We don't know actual size of loaded image, -; so try to calculate it using partition structure, -; assuming that file systems fill the real size based on contents of the partition. +; so try to calculate it using partition structure, assuming +; that file systems fill the real size based on contents of the partition. ; 2a. Prepare for loop over partitions. xor eax, eax xor ecx, ecx