Changeset 81b1db8 in mainline
- Timestamp:
- 2018-03-26T15:26:27Z (7 years ago)
- 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)
- Location:
- uspace
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/mkexfat/mkexfat.c
rfd57745c r81b1db8 104 104 } exfat_cfg_t; 105 105 106 static unsigned log2 (unsigned n);106 static unsigned log2i(unsigned n); 107 107 108 108 static uint32_t … … 270 270 mbs->version.minor = 0; 271 271 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); 274 274 275 275 /* Maximum cluster size is 32 Mb */ … … 676 676 */ 677 677 static unsigned 678 log2 (unsigned n)678 log2i(unsigned n) 679 679 { 680 680 unsigned r; -
uspace/drv/platform/amdm37x/amdm37x.c
rfd57745c r81b1db8 45 45 46 46 static void 47 log (const volatile void *place, uint64_t val, volatile void *base, size_t size,47 log_message(const volatile void *place, uint64_t val, volatile void *base, size_t size, 48 48 void *data, bool write) 49 49 { … … 104 104 105 105 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); 115 115 } 116 116 return EOK; -
uspace/lib/softrend/filter.c
rfd57745c r81b1db8 39 39 40 40 41 static long round(double val)41 static long _round(double val) 42 42 { 43 43 return val > 0 ? (long) (val + 0.5) : (long) (val - 0.5); 44 44 } 45 45 46 static long floor(double val)46 static long _floor(double val) 47 47 { 48 48 long lval = (long) val; … … 52 52 } 53 53 54 static long ceil(double val)54 static long _ceil(double val) 55 55 { 56 56 long lval = (long) val; … … 79 79 pixelmap_extend_t extend) 80 80 { 81 return pixelmap_get_extended_pixel(pixmap, round(x),round(y), extend);81 return pixelmap_get_extended_pixel(pixmap, _round(x), _round(y), extend); 82 82 } 83 83 … … 85 85 pixelmap_extend_t extend) 86 86 { 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); 91 91 92 92 if (y1 == y2 && x1 == x2) {
Note:
See TracChangeset
for help on using the changeset viewer.