Changeset c67dbd6 in mainline


Ignore:
Timestamp:
2013-09-09T21:51:32Z (11 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8cbf1c3
Parents:
8442d10
Message:

cstyle

Location:
uspace
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/uhci/utils/malloc32.h

    r8442d10 rc67dbd6  
    9292 */
    9393static inline void free32(void *addr)
    94         { free(addr); }
     94{
     95        free(addr);
     96}
    9597
    9698/** Create 4KB page mapping
    … …  
    98100 * @return Address of the mapped page, NULL on failure.
    99101 */
    100 static inline void * get_page(void)
     102static inline void *get_page(void)
    101103{
    102104        uintptr_t phys;
    … …  
    106108            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
    107109            &address);
    108         return ret == EOK ? address : NULL;
     110       
     111        return ((ret == EOK) ? address : NULL);
    109112}
    110113

  • uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

    r8442d10 rc67dbd6  
    281281                return ret;
    282282        }
     283       
    283284        amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp *8, (uint32_t)pa);
    284285        dispc->active_fb.idx = mode.index;

  • uspace/lib/c/include/ddi.h

    r8442d10 rc67dbd6  
    7272extern uint32_t pio_read_32(const ioport32_t *);
    7373
    74 static inline uint8_t pio_change_8(
    75     ioport8_t *reg, uint8_t val, uint8_t mask, useconds_t delay)
     74static inline uint8_t pio_change_8(ioport8_t *reg, uint8_t val, uint8_t mask,
     75    useconds_t delay)
    7676{
    7777        uint8_t v = pio_read_8(reg);
    … …  
    8181}
    8282
    83 static inline uint16_t pio_change_16(
    84     ioport16_t *reg, uint16_t val, uint16_t mask, useconds_t delay)
     83static inline uint16_t pio_change_16(ioport16_t *reg, uint16_t val,
     84    uint16_t mask, useconds_t delay)
    8585{
    8686        uint16_t v = pio_read_16(reg);
    … …  
    9090}
    9191
    92 static inline uint32_t pio_change_32(
    93     ioport32_t *reg, uint32_t val, uint32_t mask, useconds_t delay)
     92static inline uint32_t pio_change_32(ioport32_t *reg, uint32_t val,
     93    uint32_t mask, useconds_t delay)
    9494{
    9595        uint32_t v = pio_read_32(reg);
Note: See TracChangeset for help on using the changeset viewer.