Index: uspace/drv/audio/sb16/ddf_log.h =================================================================== --- uspace/drv/audio/sb16/ddf_log.h (revision 53738d363dfe64f2c2f3ef4b2a9212eda500f333) +++ uspace/drv/audio/sb16/ddf_log.h (revision 53738d363dfe64f2c2f3ef4b2a9212eda500f333) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2011 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvaudiosb16 + * @{ + */ +/** @file + * @brief DDF log helper macros + */ +#ifndef DRV_AUDIO_SB16_DDF_LOG_H +#define DRV_AUDIO_SB16_DDF_LOG_H + +#include + +#define ddf_log_fatal(msg...) ddf_msg(LVL_FATAL, msg) +#define ddf_log_error(msg...) ddf_msg(LVL_ERROR, msg) +#define ddf_log_warning(msg...) ddf_msg(LVL_WARNING, msg) +#define ddf_log_note(msg...) ddf_msg(LVL_NOTE, msg) +#define ddf_log_debug(msg...) ddf_msg(LVL_DEBUG, msg) +#define ddf_log_debug2(msg...) ddf_msg(LVL_DEBUG2, msg) + +#endif +/** + * @} + */ Index: uspace/drv/audio/sb16/main.c =================================================================== --- uspace/drv/audio/sb16/main.c (revision 2fc487fc6ac83f75fe56ab85a74d3c13b2bdae55) +++ uspace/drv/audio/sb16/main.c (revision 53738d363dfe64f2c2f3ef4b2a9212eda500f333) @@ -36,16 +36,20 @@ #include #include +#include +#include +#include #include #include -//#include //#include - -//#include "pci.h" +#include "ddf_log.h" +#include "sb16.h" #define NAME "sb16" static int sb_add_device(ddf_dev_t *device); +static int sb_get_res(const ddf_dev_t *device, uintptr_t *sb_regs, + size_t *sb_regs_size, uintptr_t *mpu_regs, size_t *mpu_regs_size, int *irq); /*----------------------------------------------------------------------------*/ static driver_ops_t sb_driver_ops = { @@ -58,15 +62,4 @@ }; //static ddf_dev_ops_t sb_ops = {}; -/*----------------------------------------------------------------------------*/ -/** Initializes a new ddf driver instance of SB16. - * - * @param[in] device DDF instance of the device to initialize. - * @return Error code. - */ -static int sb_add_device(ddf_dev_t *device) -{ - assert(device); - return ENOTSUP; -} /*----------------------------------------------------------------------------*/ /** Initializes global driver structures (NONE). @@ -84,4 +77,73 @@ return ddf_driver_main(&sb_driver); } +/*----------------------------------------------------------------------------*/ +/** Initializes a new ddf driver instance of SB16. + * + * @param[in] device DDF instance of the device to initialize. + * @return Error code. + */ +static int sb_add_device(ddf_dev_t *device) +{ + assert(device); + uintptr_t sb_regs = 0, mpu_regs = 0; + size_t sb_regs_size = 0, mpu_regs_size = 0; + int irq = 0; + int ret = sb_get_res(device, &sb_regs, &sb_regs_size, &mpu_regs, + &mpu_regs_size, &irq); + + return ret; +} +/*----------------------------------------------------------------------------*/ +static int sb_get_res(const ddf_dev_t *device, uintptr_t *sb_regs, + size_t *sb_regs_size, uintptr_t *mpu_regs, size_t *mpu_regs_size, int *irq) +{ + assert(device); + assert(sb_regs); + assert(sb_regs_size); + assert(mpu_regs); + assert(mpu_regs_size); + assert(irq); + + async_sess_t *parent_sess = + devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle, + IPC_FLAG_BLOCKING); + if (!parent_sess) + return ENOMEM; + + hw_resource_list_t hw_resources; + const int rc = hw_res_get_resource_list(parent_sess, &hw_resources); + if (rc != EOK) { + async_hangup(parent_sess); + return rc; + } + + size_t i; + for (i = 0; i < hw_resources.count; i++) { + const hw_resource_t *res = &hw_resources.resources[i]; + switch (res->type) { + case INTERRUPT: + *irq = res->res.interrupt.irq; + ddf_log_debug("Found interrupt: %d.\n", *irq); + break; + case IO_RANGE: + ddf_log_debug("Found io: %" PRIx64" %zu.\n", + res->res.io_range.address, res->res.io_range.size); + if (res->res.io_range.size >= sizeof(sb16_regs_t)) { + *sb_regs = res->res.io_range.address; + *sb_regs_size = res->res.io_range.size; + } else { + *mpu_regs = res->res.io_range.address; + *mpu_regs_size = res->res.io_range.size; + } + break; + default: + break; + } + } + + async_hangup(parent_sess); + free(hw_resources.resources); + return EOK; +} /** * @} Index: uspace/drv/audio/sb16/registers.h =================================================================== --- uspace/drv/audio/sb16/registers.h (revision 53738d363dfe64f2c2f3ef4b2a9212eda500f333) +++ uspace/drv/audio/sb16/registers.h (revision 53738d363dfe64f2c2f3ef4b2a9212eda500f333) @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2011 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvaudiosb16 + * @{ + */ +/** @file + * @brief SB16 main structure combining all functionality + */ +#ifndef DRV_AUDIO_SB16_REGISTERS_H +#define DRV_AUDIO_SB16_REGISTERS_H + +typedef struct sb16_regs { + ioport8_t fm_address_status; + ioport8_t fm_data; + ioport8_t afm_address_status; + ioport8_t afm_data; + ioport8_t mixer_address; + ioport8_t mixer_data; + ioport16_t dsp_reset; + ioport8_t fm_address_status2; + ioport8_t fm_data2; + const ioport8_t dsp_data_read; + ioport8_t dsp_write; /* Both command and data, bit 7 is write status */ + const ioport8_t dsp_read_status; /* Bit 7 */ + ioport8_t reserved; + ioport8_t cd_command_data; + ioport8_t cd_status; + ioport8_t cd_reset; + ioport8_t cd_enable; +} sb16_regs_t; + +typedef struct mpu_regs { + ioport8_t data; +#define MPU_CMD_ACK (0xfe) + + ioport8_t status_command; +#define MPU_STATUS_OUTPUT_BUSY (1 << 6) +#define MPU_STATUS_INPUT_BUSY (1 << 7) + +#define MPU_CMD_RESET (0xff) +#define MPU_CMD_ENTER_UART (0x3f) +} mpu_regs_t; + +#endif +/** + * @} + */ + Index: uspace/drv/audio/sb16/sb16.h =================================================================== --- uspace/drv/audio/sb16/sb16.h (revision 53738d363dfe64f2c2f3ef4b2a9212eda500f333) +++ uspace/drv/audio/sb16/sb16.h (revision 53738d363dfe64f2c2f3ef4b2a9212eda500f333) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2011 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvaudiosb16 + * @{ + */ +/** @file + * @brief SB16 main structure combining all functionality + */ +#ifndef DRV_AUDIO_SB16_SB16_H +#define DRV_AUDIO_SB16_SB16_H + +#include +#include "registers.h" + +typedef struct sb16_drv { + sb16_regs_t *regs; + mpu_regs_t *mpu_regs; +} sb16_drv_t; + +int sb16_init_sb16(sb16_drv_t *drv, void *regs, size_t size); +int sb16_init_mpu(sb16_drv_t *drv, void *regs, size_t size); + +#endif +/** + * @} + */ +