Changeset 25c98a8e in mainline for uspace/drv/audio/sb16/sb16.c
- Timestamp:
- 2011-11-25T22:11:00Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- b67968c
- Parents:
- 53a7fda
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/audio/sb16/sb16.c
r53a7fda r25c98a8e 29 29 #include <errno.h> 30 30 #include <str_error.h> 31 #include <audio_mixer_iface.h> 31 32 32 33 #include "beep.h" … … 35 36 #include "dsp.h" 36 37 #include "sb16.h" 38 39 extern audio_mixer_iface_t sb_mixer_iface; 40 41 static ddf_dev_ops_t sb_mixer_ops = { 42 .interfaces[AUDIO_MIXER_IFACE] = &sb_mixer_iface, 43 }; 37 44 38 45 /* ISA interrupts should be edge-triggered so there should be no need for … … 85 92 sb->dsp.version.major, sb->dsp.version.minor); 86 93 94 ddf_fun_t *mixer_fun = ddf_fun_create(dev, fun_exposed, "mixer"); 95 if (!mixer_fun) { 96 ddf_log_error("Failed to create mixer function.\n"); 97 return ENOMEM; 98 } 87 99 ret = sb_mixer_init(&sb->mixer, sb->regs, mixer_type); 88 100 if (ret != EOK) { … … 91 103 return ret; 92 104 } 105 93 106 ddf_log_note("Initialized mixer: %s.\n", 94 107 sb_mixer_type_str(sb->mixer.type)); 108 mixer_fun->driver_data = &sb->mixer; 109 mixer_fun->ops = &sb_mixer_ops; 110 111 ret = ddf_fun_bind(mixer_fun); 112 if (ret != EOK) { 113 ddf_log_error( 114 "Failed to bind mixer function: %s.\n", str_error(ret)); 115 mixer_fun->driver_data = NULL; 116 ddf_fun_destroy(mixer_fun); 117 return ret; 118 } 95 119 96 120 ddf_log_note("Playing startup sound.\n");
Note:
See TracChangeset
for help on using the changeset viewer.