Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add /SCFM and /SCMPU options, to select which cards to use for FM/MPU #89

Merged
merged 7 commits into from
Feb 15, 2024

Conversation

jiyunomegami
Copy link
Contributor

@jiyunomegami jiyunomegami commented Feb 14, 2024

It will print which card is being used, like this:
OPL3 hardware(2:ALS4000) at port 388: enabled.
MPU-401 UART hardware(1:YMF) at address 330: enabled.
SB Pro(3:TRIDENT) emulation at address 220, IRQ 7, DMA 1: enabled.

*ALS4000 and Trident drivers are not included in this.

The /MCOM option default is now 9: hardware only (no serial output)
Other changes:
[Allow IRQ 9 with /I option] (I have a motherboard that can reserve IRQ numbers only from 9 on up)
[Base 10 option support] (Used for /SC* options and /K option)
[Allow arbitrary sample rate between 4KHz and 192KHz with the /K option] (Good for testing)

Also, like I mentioned in #84 I removed -O2 and -save-temps from CFLAGS/LDFLAGS

@crazii
Copy link
Owner

crazii commented Feb 14, 2024

OK, I was just about to ask the base 10 one,
You can utilize the CMD flags to add a base 10 bit, by default it be hex, with that bit it be decimal.

Or I can change that part later after merging.
I just got some time and please wait before I merge it.

@jiyunomegami
Copy link
Contributor Author

The base 10 stuff, you can just change it later.
I fixed the display of current settings/changed settings too.
So if you haven't done that, you can just update opt_base to use the base 10 bit.

@@ -49,6 +58,11 @@ extern one_sndcard_info VIA82XX_sndcard_info;
extern one_sndcard_info SBLIVE_sndcard_info;
extern one_sndcard_info CMI8X38_sndcard_info;
extern one_sndcard_info EMU20KX_sndcard_info;
extern one_sndcard_info CTXFI_sndcard_info;
extern one_sndcard_info EMU10K1X_sndcard_info;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you last mentioned Trident card driver are not included, so there might be linking errors. but We can fix later if that is the case.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a mistake when merging, putting back EMU20KX_sndcard_info. EMU20KX will be replaced by CTXFI.
It is OK for now because AU_CARDS_LINK_CTXFI etc. are not defined yet.

@crazii crazii merged commit f95af9d into crazii:main Feb 15, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants