-
Notifications
You must be signed in to change notification settings - Fork 62
Implement VirtIO sound device playback #53
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
[submodule "cnfa"] | ||
path = cnfa | ||
url = https://github.com/cntools/cnfa | ||
shallow = true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -306,6 +306,53 @@ void aclint_sswi_write(hart_t *hart, | |
uint8_t width, | ||
uint32_t value); | ||
|
||
/* VirtIO-Sound */ | ||
|
||
Cuda-Chen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
#if SEMU_HAS(VIRTIOSND) | ||
#define IRQ_VSND 5 | ||
#define IRQ_VSND_BIT (1 << IRQ_VSND) | ||
|
||
typedef struct { | ||
uint32_t QueueNum; | ||
uint32_t QueueDesc; | ||
uint32_t QueueAvail; | ||
uint32_t QueueUsed; | ||
uint16_t last_avail; | ||
bool ready; | ||
} virtio_snd_queue_t; | ||
|
||
typedef struct { | ||
/* feature negotiation */ | ||
uint32_t DeviceFeaturesSel; | ||
uint32_t DriverFeatures; | ||
uint32_t DriverFeaturesSel; | ||
/* queue config */ | ||
uint32_t QueueSel; | ||
virtio_snd_queue_t queues[4]; | ||
/* status */ | ||
uint32_t Status; | ||
uint32_t InterruptStatus; | ||
/* supplied by environment */ | ||
uint32_t *ram; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am not sure There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I just copy-and-paste from |
||
/* implementation-specific */ | ||
void *priv; | ||
} virtio_snd_state_t; | ||
|
||
void virtio_snd_read(hart_t *core, | ||
virtio_snd_state_t *vsnd, | ||
uint32_t addr, | ||
uint8_t width, | ||
uint32_t *value); | ||
|
||
void virtio_snd_write(hart_t *core, | ||
virtio_snd_state_t *vsnd, | ||
uint32_t addr, | ||
uint8_t width, | ||
uint32_t value); | ||
|
||
bool virtio_snd_init(virtio_snd_state_t *vsnd); | ||
#endif /* SEMU_HAS(VIRTIOSND) */ | ||
|
||
/* memory mapping */ | ||
typedef struct { | ||
bool stopped; | ||
|
@@ -326,4 +373,7 @@ typedef struct { | |
mtimer_state_t mtimer; | ||
mswi_state_t mswi; | ||
sswi_state_t sswi; | ||
#if SEMU_HAS(VIRTIOSND) | ||
virtio_snd_state_t vsnd; | ||
#endif | ||
} emu_state_t; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Create a mininal ALSA program | ||
jserv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
define create-alsa-prog | ||
echo '\ | ||
#include <alsa/asoundlib.h>\n\ | ||
int main(){\n\ | ||
snd_pcm_t *pcm;\n\ | ||
snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK, 0);\n\ | ||
snd_pcm_close(pcm);\n\ | ||
return 0;\n\ | ||
}\n' | ||
endef | ||
|
||
# Check ALSA installation | ||
define check-alsa | ||
$(shell $(call create-alsa-prog) | $(CC) -x c -lasound -o /dev/null > /dev/null 2> /dev/null - | ||
&& echo $$?) | ||
endef |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.