Changeset 3bacee1 in mainline for uspace/drv/audio/sb16/main.c
- Timestamp:
- 2018-04-12T16:27:17Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3cf22f9
- Parents:
- 76d0981d
- git-author:
- Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)
- git-committer:
- Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/audio/sb16/main.c
r76d0981d r3bacee1 71 71 int main(int argc, char *argv[]) 72 72 { 73 printf(NAME ": HelenOS SB16 audio driver.\n");73 printf(NAME ": HelenOS SB16 audio driver.\n"); 74 74 ddf_log_init(NAME); 75 75 return ddf_driver_main(&sb_driver); … … 191 191 /* 1x IRQ, 1-2x DMA(8,16), 1-2x IO (MPU is separate). */ 192 192 if (hw_res.irqs.count != 1 || 193 (hw_res.io_ranges.count != 1 && hw_res.io_ranges.count != 2) ||194 (hw_res.dma_channels.count != 1 && hw_res.dma_channels.count != 2)) {193 (hw_res.io_ranges.count != 1 && hw_res.io_ranges.count != 2) || 194 (hw_res.dma_channels.count != 1 && hw_res.dma_channels.count != 2)) { 195 195 hw_res_list_parsed_clean(&hw_res); 196 196 return EINVAL; … … 229 229 } else { 230 230 const int sb = 231 (hw_res.io_ranges.ranges[0].size >= sizeof(sb16_regs_t)) 232 ?0 : 1;231 (hw_res.io_ranges.ranges[0].size >= sizeof(sb16_regs_t)) ? 232 0 : 1; 233 233 const int mpu = 1 - sb; 234 234 if (pp_sb_regs && *pp_sb_regs)
Note:
See TracChangeset
for help on using the changeset viewer.