KolibriOS/kolibrios
17
27
Fork 69
Code Issues 157 Pull Requests 49 Actions 1 Projects 2 Releases Wiki Activity

drivers/audio: add es1371, fix hang in infinity #571

Merged
Burer merged 4 commits from es1371-driver-upload into main 2026-07-14 04:53:20 +00:00
Conversation 4 Commits 4 Files Changed 6
+1287 -1178
Leency commented 2026-07-11 23:05:41 +00:00
Owner
Copy Link
Copy Source
  • add es1371 sound driver
  • fix hang in infinity
  • remove garbage ensoniq.asm
  • add "Multimedia audio controller detected with PciId=VEN:DEV", same as vidintel does

Tested with 3 cards.

- add es1371 sound driver - fix hang in infinity - remove garbage ensoniq.asm - add "Multimedia audio controller detected with PciId=VEN:DEV", same as vidintel does Tested with 3 cards.
PXL_20260711_230722167.jpg
4.3 MiB
PXL_20260711_230722167.jpg
Leency requested review from Ghost 2026-07-11 23:17:17 +00:00
Leency requested review from Ghost 2026-07-11 23:17:17 +00:00
dunkaist requested changes 2026-07-12 02:30:24 +00:00
Dismissed
drivers/audio/es1371.asm Outdated
@@ -0,0 +1,1192 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
dunkaist commented 2026-07-12 02:15:27 +00:00
Owner
Copy Link
Copy Source

Should we add es1371.sys to kolibri.img or kolibri.raw?

Should we add es1371.sys to kolibri.img or kolibri.raw?
dunkaist marked this conversation as resolved
drivers/audio/es1371.asm Outdated
@@ -0,0 +1034,4 @@
; the codec for true silence instead of intelac97's "quiet but audible"
cmp eax, -VOL_MIN
jne .scale
mov ebx, 0x8000 + (63 shl 8) + 63 ; mute bit + max attenuation
dunkaist commented 2026-07-12 02:27:07 +00:00
Owner
Copy Link
Copy Source

Maybe use constants instead of these magic numbers?

Maybe use constants instead of these magic numbers?
dunkaist marked this conversation as resolved
drivers/audio/es1371.asm Outdated
@@ -0,0 +1100,4 @@
endp
align 4
proc StallExec
dunkaist commented 2026-07-12 02:29:33 +00:00
Owner
Copy Link
Copy Source

The four pushes below (and the corresponding pops at the end of the function) can be written as follows:
proc StallExec uses ecx edx ebx eax

The four pushes below (and the corresponding pops at the end of the function) can be written as follows: proc StallExec uses ecx edx ebx eax
dunkaist marked this conversation as resolved
drivers/audio/sound.asm Outdated
@@ -222,2 +227,4 @@
.loop:
mov ecx, [eax + PCIDEV.vendor_device_id]
if DEBUG
; report every multimedia-class function, supported or not, so unknown
dunkaist commented 2026-07-12 02:11:13 +00:00
Owner
Copy Link
Copy Source

Maybe we should report not 'every multimedia-class function' but only audio devices. This is sound.asm, after all.

Maybe we should report not 'every multimedia-class function' but only audio devices. This is sound.asm, after all.
dunkaist marked this conversation as resolved
drivers/audio/sound.asm Outdated
@@ -224,0 +231,4 @@
; sound hardware always shows its PCI ids in the debug board
mov ebx, [eax + PCIDEV.class]
shr ebx, 16 ; base class (kernel stores class:sub:if)
cmp ebx, 0x04 ; 04h = multimedia controllers
dunkaist commented 2026-07-12 01:54:53 +00:00
Owner
Copy Link
Copy Source

PCI class 0x04 (multimedia) is checked, but device subclass isn't. The current code of sound.asm will report video devices (subclass 0x00) and other subclasses too.

PCI class 0x04 (multimedia) is checked, but device _subclass_ isn't. The current code of sound.asm will report video devices (subclass 0x00) and other subclasses too.
dunkaist marked this conversation as resolved
drivers/audio/sound.asm Outdated
@@ -285,6 +300,49 @@ proc detect_controller
endp
; eax = vendor_device_id (low16=VID, high16=DID); prints 'VEN: xxxx DEV: xxxx'
dunkaist commented 2026-07-12 02:09:10 +00:00
Owner
Copy Link
Copy Source

I think it doesn't print "VEN: xxxx DEV: xxxx", it prints in a different format.

I think it doesn't print "VEN: xxxx DEV: xxxx", it prints in a different format.
dunkaist marked this conversation as resolved
drivers/audio/sound.asm Outdated
@@ -288,0 +324,4 @@
; prints eax's TOP 16 bits as 4 hex chars, no newline; trashes eax/ebx/ecx/esi
align 4
print_hex16:
dunkaist commented 2026-07-12 02:02:16 +00:00
Owner
Copy Link
Copy Source

This function is used only if DEBUG = 1, but it is always compiled in.

This function is used only if DEBUG = 1, but it is always compiled in.
dunkaist marked this conversation as resolved
drivers/audio/sound.asm Outdated
@@ -288,0 +338,4 @@
invoke SysMsgBoardStr
ret
hexletters db '0123456789ABCDEF'
dunkaist commented 2026-07-12 01:57:44 +00:00
Owner
Copy Link
Copy Source

These messages should probably go closer to other messages (msgInit, msgFail) at the end of the file.

These messages should probably go closer to other messages (msgInit, msgFail) at the end of the file.
dunkaist marked this conversation as resolved
Leency commented 2026-07-12 10:08:03 +00:00
Author
Owner
Copy Link
Copy Source

@dunkaist all points should be fixed, please check.

@dunkaist all points should be fixed, please check.
Leency requested review from dunkaist 2026-07-12 10:08:09 +00:00
dunkaist approved these changes 2026-07-12 11:30:25 +00:00
Doczom approved these changes 2026-07-13 22:32:05 +00:00
Burer added 4 commits 2026-07-14 04:42:38 +00:00
drivers/audio: add es1371, fix hang in infinity c09de2cac8 
- add es1371 sound driver
- fix hang in infinity
- remove garbage ensoniq.asm
- add "Multimedia audio controller detected with PciId=VEN:DEV", same as vidintel does
clean debug f6f21568ea
es1371: add to IMG 5549c433b9
fixes for dunkaist request
Test PR / Build (es_ES) (pull_request) Successful in 4m45s
Details
Test PR / Build (ru_RU) (pull_request) Successful in 4m48s
Details
Test PR / Build (en_US) (pull_request) Successful in 4m51s
Details
1ae39c50f5
Burer force-pushed es1371-driver-upload from 81ccea4892 to 1ae39c50f5 2026-07-14 04:42:38 +00:00 Compare
Burer merged commit e641f6c400 into main 2026-07-14 04:53:20 +00:00
Burer deleted branch es1371-driver-upload 2026-07-14 04:53:20 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
dunkaist
Doczom
KolibriOS/Developers
Labels
Clear labels
Influence/Text/TYPO
AI
Eolite
FS
GSoC
This issue or PR in the Google Source of Code program
 Good First PR
The issue is suitable to beginners
 HLL
HardwareTested
IRCC
Influence/Settings
Lang/C
Lang/FASM
Pay for the code
Paid task
 Subsystem/API
Subsystem/Audio
infinity service, audio drivers, midi, speacker, audio programs
 Subsystem/Graphics
vesa, vga, framebuffer, cursors, blitter, and video drivers
 Subsystem/IPC and events
pipes, signals, events, shared memory
 Subsystem/Memory
virt and phys memory allocators, malloc and other
 Subsystem/Network
Subsystem/Services(daemon)
userspace and kernel(for example: serial) services
 Subsystem/Taskmanager
process, threads, run apps, scheduler
 Subsystem/VFS
drivers from filesystem, fs api, blkdev, programs that work with the file system
 Subsystem/Window
windows, skins, buttons, mouse and keyboard code for windows (not the base code)
Category
Applications
Category
Drivers
Category
General
Category
Kernel
Category
Libraries
Kind
Breaking
Breaking change that won't be backward compatible
Kind
Bug
Something is not working
Kind
Build
Kind
Documentation
Documentation changes
Kind
Enhancement
Improve existing functionality
Kind
Feature
New functionality
Kind
Security
This is security issue
Kind
Testing
Issue or pull request related to testing
PR
Ready to merge
Pull request is ready for merge
PR
Conflicts
PR conflicts with main
PR
Dependent
This PR is dependent on another PR
PR
Request changes
Changes requested in pull request
PR
Review required
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Medium
3
The priority is medium
Priority
Low
4
The priority is low
Reviewed
Confirmed
Issue has been confirmed
Reviewed
Duplicate
This issue or pull request already exists
Reviewed
Invalid
Invalid issue
Reviewed
Won't Fix
This issue won't be fixed
Status
Abandoned
Somebody has started to work on this but abandoned work
Status
Blocked
Something is blocking this issue or pull request
Status
Need More Info
Feedback is required to reproduce issue or to continue work
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
ace-dent (Andrew) b00bl1k (Alexey Ryabov) bad_Dr3dd0x Burer Doczom (Mikhail Frolov) dunkaist (Ivan B) Egor00f (Егор Ярин) hidnplayr IgorA Leency (Kiril Lipatov) mxlgv (Max Logaev) ramenu rgimad sdongles (Serhii Sakhno) Sweetbread (Gleb Zaharov)
No Assignees
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: KolibriOS/kolibrios#571