Changeset 1433ecda in mainline for uspace/drv/audio


Ignore:
Timestamp:
2018-04-04T15:42:37Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2c4e1cc
Parents:
47b2d7e3
Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

Location:
uspace/drv/audio
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/audio/hdaudio/codec.c

    r47b2d7e3 r1433ecda  
    435435        if ((pcaps & BIT_V(uint32_t, pwc_output)) != 0) {
    436436                ddf_msg(LVL_NOTE, "PIN %d will enable output", aw);
    437                 pctl = pctl | BIT_V(uint8_t, pctl_out_enable);
     437                pctl = pctl | BIT_V(uint8_t, pctl_out_enable);
    438438        }
    439439
    440440        if ((pcaps & BIT_V(uint32_t, pwc_input)) != 0) {
    441441                ddf_msg(LVL_NOTE, "PIN %d will enable input", aw);
    442                 pctl = pctl | BIT_V(uint8_t, pctl_in_enable);
     442                pctl = pctl | BIT_V(uint8_t, pctl_in_enable);
    443443        }
    444444
    445445        if ((pcaps & BIT_V(uint32_t, pwc_hpd)) != 0) {
    446446                ddf_msg(LVL_NOTE, "PIN %d will enable headphone drive", aw);
    447                 pctl = pctl | BIT_V(uint8_t, pctl_hpd_enable);
     447                pctl = pctl | BIT_V(uint8_t, pctl_hpd_enable);
    448448        }
    449449

  • uspace/drv/audio/hdaudio/hdactl.c

    r47b2d7e3 r1433ecda  
    514514        ddf_msg(LVL_NOTE, "reg 0x%zx STATESTS = 0x%x",
    515515            (void *)&hda->regs->statests - (void *)hda->regs,
    516                 hda_reg16_read(&hda->regs->statests));
     516            hda_reg16_read(&hda->regs->statests));
    517517        /**
    518518          * Clear STATESTS bits so they don't generate an interrupt later
    … …  
    523523        ddf_msg(LVL_NOTE, "after clearing reg 0x%zx STATESTS = 0x%x",
    524524            (void *)&hda->regs->statests - (void *)hda->regs,
    525                 hda_reg16_read(&hda->regs->statests));
     525            hda_reg16_read(&hda->regs->statests));
    526526
    527527        gctl = hda_reg32_read(&hda->regs->gctl);
    … …  
    544544
    545545                ddf_msg(LVL_NOTE, "Waiting for controller to initialize.");
    546                 async_usleep(100*1000);
     546                async_usleep(100 * 1000);
    547547                --cnt;
    548548        }

  • uspace/drv/audio/hdaudio/pcm_iface.c

    r47b2d7e3 r1433ecda  
    356356
    357357        if (hda->ev_sess == NULL) {
    358                 if (0) ddf_log_warning("No one listening for event %u", event);
     358                if (0)
     359                        ddf_log_warning("No one listening for event %u", event);
    359360                return;
    360361        }

  • uspace/drv/audio/sb16/dsp_commands.h

    r47b2d7e3 r1433ecda  
    166166#define DSP_MODE_STEREO 0x20
    167167
    168 static inline const char * mode_to_str(uint8_t mode)
     168static inline const char *mode_to_str(uint8_t mode)
    169169{
    170170        if (mode & 0xcf)
    171171                return "unknown";
    172         static const char * names[] = {
     172        static const char *names[] = {
    173173                "unsigned mono (8bit)",
    174174                "signed mono (16bit)",

  • uspace/drv/audio/sb16/mixer_iface.c

    r47b2d7e3 r1433ecda  
    4646}
    4747
    48 static errno_t sb_get_info(ddf_fun_t *fun, const char** name, unsigned *items)
     48static errno_t sb_get_info(ddf_fun_t *fun, const char **name, unsigned *items)
    4949{
    5050        sb_mixer_t *mixer = fun_to_mixer(fun);
    … …  
    5858}
    5959
    60 static errno_t sb_get_item_info(ddf_fun_t *fun, unsigned item, const char** name,
     60static errno_t sb_get_item_info(ddf_fun_t *fun, unsigned item, const char **name,
    6161    unsigned *max_level)
    6262{

  • uspace/drv/audio/sb16/pcm_iface.c

    r47b2d7e3 r1433ecda  
    4747}
    4848
    49 static errno_t sb_get_info_str(ddf_fun_t *fun, const char** name)
     49static errno_t sb_get_info_str(ddf_fun_t *fun, const char **name)
    5050{
    5151        if (name)
    … …  
    7979}
    8080
    81 static async_sess_t * sb_get_event_session(ddf_fun_t *fun)
     81static async_sess_t *sb_get_event_session(ddf_fun_t *fun)
    8282{
    8383        return sb_dsp_get_event_session(fun_to_dsp(fun));

  • uspace/drv/audio/sb16/sb16.c

    r47b2d7e3 r1433ecda  
    6060    unsigned major, unsigned minor)
    6161{
    62         switch (major)
    63         {
    64         case 1: return SB_MIXER_NONE; /* SB 1.5 and early 2.0 = no mixer chip */
    65         case 2: return (minor == 0) ? SB_MIXER_NONE : SB_MIXER_CT1335;
    66         case 3: return SB_MIXER_CT1345; /* SB Pro */
    67         case 4: return SB_MIXER_CT1745; /* SB 16  */
    68         default: return SB_MIXER_UNKNOWN;
     62        switch (major) {
     63        case 1:
     64                return SB_MIXER_NONE; /* SB 1.5 and early 2.0 = no mixer chip */
     65        case 2:
     66                return (minor == 0) ? SB_MIXER_NONE : SB_MIXER_CT1335;
     67        case 3:
     68                return SB_MIXER_CT1345; /* SB Pro */
     69        case 4:
     70                return SB_MIXER_CT1745; /* SB 16  */
     71        default:
     72                return SB_MIXER_UNKNOWN;
    6973        }
    7074}
Note: See TracChangeset for help on using the changeset viewer.