Changeset 81b1db8 in mainline


Ignore:
Timestamp:
2018-03-26T15:26:27Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
41bbab6
Parents:
fd57745c
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-26 15:21:43)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-26 15:26:27)
Message:

Avoid using standard C function names for local functions.

Location:
uspace
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/mkexfat/mkexfat.c

    rfd57745c r81b1db8  
    104104} exfat_cfg_t;
    105105
    106 static unsigned log2(unsigned n);
     106static unsigned log2i(unsigned n);
    107107
    108108static uint32_t
    … …  
    270270        mbs->version.minor = 0;
    271271        mbs->volume_flags = host2uint16_t_le(0);
    272         mbs->bytes_per_sector = log2(cfg->sector_size);
    273         mbs->sec_per_cluster = log2(cfg->cluster_size / cfg->sector_size);
     272        mbs->bytes_per_sector = log2i(cfg->sector_size);
     273        mbs->sec_per_cluster = log2i(cfg->cluster_size / cfg->sector_size);
    274274
    275275        /* Maximum cluster size is 32 Mb */
    … …  
    676676 */
    677677static unsigned
    678 log2(unsigned n)
     678log2i(unsigned n)
    679679{
    680680        unsigned r;

  • uspace/drv/platform/amdm37x/amdm37x.c

    rfd57745c r81b1db8  
    4545
    4646static void
    47 log(const volatile void *place, uint64_t val, volatile void *base, size_t size,
     47log_message(const volatile void *place, uint64_t val, volatile void *base, size_t size,
    4848    void *data, bool write)
    4949{
    … …  
    104104
    105105        if (trace) {
    106                 pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log, (void*)AMDM37x_USBTLL_BASE_ADDRESS);
    107                 pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log, (void*)CLOCK_CONTROL_CM_BASE_ADDRESS);
    108                 pio_trace_enable(device->cm.core, CORE_CM_SIZE, log, (void*)CORE_CM_BASE_ADDRESS);
    109                 pio_trace_enable(device->cm.mpu, MPU_CM_SIZE, log, (void*)MPU_CM_BASE_ADDRESS);
    110                 pio_trace_enable(device->cm.iva2, IVA2_CM_SIZE, log, (void*)IVA2_CM_BASE_ADDRESS);
    111                 pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log, (void*)USBHOST_CM_BASE_ADDRESS);
    112                 pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log, (void*)AMDM37x_UHH_BASE_ADDRESS);
    113                 pio_trace_enable(device->prm.clocks, CLOCK_CONTROL_PRM_SIZE, log, (void*)CLOCK_CONTROL_PRM_BASE_ADDRESS);
    114                 pio_trace_enable(device->prm.global, GLOBAL_REG_PRM_SIZE, log, (void*)GLOBAL_REG_PRM_BASE_ADDRESS);
     106                pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log_message, (void*)AMDM37x_USBTLL_BASE_ADDRESS);
     107                pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log_message, (void*)CLOCK_CONTROL_CM_BASE_ADDRESS);
     108                pio_trace_enable(device->cm.core, CORE_CM_SIZE, log_message, (void*)CORE_CM_BASE_ADDRESS);
     109                pio_trace_enable(device->cm.mpu, MPU_CM_SIZE, log_message, (void*)MPU_CM_BASE_ADDRESS);
     110                pio_trace_enable(device->cm.iva2, IVA2_CM_SIZE, log_message, (void*)IVA2_CM_BASE_ADDRESS);
     111                pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log_message, (void*)USBHOST_CM_BASE_ADDRESS);
     112                pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log_message, (void*)AMDM37x_UHH_BASE_ADDRESS);
     113                pio_trace_enable(device->prm.clocks, CLOCK_CONTROL_PRM_SIZE, log_message, (void*)CLOCK_CONTROL_PRM_BASE_ADDRESS);
     114                pio_trace_enable(device->prm.global, GLOBAL_REG_PRM_SIZE, log_message, (void*)GLOBAL_REG_PRM_BASE_ADDRESS);
    115115        }
    116116        return EOK;

  • uspace/lib/softrend/filter.c

    rfd57745c r81b1db8  
    3939
    4040
    41 static long round(double val)
     41static long _round(double val)
    4242{
    4343        return val > 0 ? (long) (val + 0.5) : (long) (val - 0.5);
    4444}
    4545
    46 static long floor(double val)
     46static long _floor(double val)
    4747{
    4848        long lval = (long) val;
    … …  
    5252}
    5353
    54 static long ceil(double val)
     54static long _ceil(double val)
    5555{
    5656        long lval = (long) val;
    … …  
    7979    pixelmap_extend_t extend)
    8080{
    81         return pixelmap_get_extended_pixel(pixmap, round(x), round(y), extend);
     81        return pixelmap_get_extended_pixel(pixmap, _round(x), _round(y), extend);
    8282}
    8383
    … …  
    8585    pixelmap_extend_t extend)
    8686{
    87         long x1 = floor(x);
    88         long x2 = ceil(x);
    89         long y1 = floor(y);
    90         long y2 = ceil(y);
     87        long x1 = _floor(x);
     88        long x2 = _ceil(x);
     89        long y1 = _floor(y);
     90        long y2 = _ceil(y);
    9191
    9292        if (y1 == y2 && x1 == x2) {
Note: See TracChangeset for help on using the changeset viewer.