Revert "media: solo6x10: replace max(a, min(b, c)) by clamp(b, a, c)"
This reverts commit 0e0829bf72
.
This commit is contained in:
parent
b59cf7d671
commit
c3c4efe7b0
1 changed files with 5 additions and 5 deletions
|
@ -57,16 +57,16 @@
|
|||
#define SOLO_MP4E_EXT_ADDR(__solo) \
|
||||
(SOLO_EREF_EXT_ADDR(__solo) + SOLO_EREF_EXT_AREA(__solo))
|
||||
#define SOLO_MP4E_EXT_SIZE(__solo) \
|
||||
clamp(__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo) - \
|
||||
__SOLO_JPEG_MIN_SIZE(__solo), \
|
||||
__solo->nr_chans * 0x00080000, 0x00ff0000)
|
||||
max((__solo->nr_chans * 0x00080000), \
|
||||
min(((__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo)) - \
|
||||
__SOLO_JPEG_MIN_SIZE(__solo)), 0x00ff0000))
|
||||
|
||||
#define __SOLO_JPEG_MIN_SIZE(__solo) (__solo->nr_chans * 0x00080000)
|
||||
#define SOLO_JPEG_EXT_ADDR(__solo) \
|
||||
(SOLO_MP4E_EXT_ADDR(__solo) + SOLO_MP4E_EXT_SIZE(__solo))
|
||||
#define SOLO_JPEG_EXT_SIZE(__solo) \
|
||||
clamp(__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo), \
|
||||
__SOLO_JPEG_MIN_SIZE(__solo), 0x00ff0000)
|
||||
max(__SOLO_JPEG_MIN_SIZE(__solo), \
|
||||
min((__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo)), 0x00ff0000))
|
||||
|
||||
#define SOLO_SDRAM_END(__solo) \
|
||||
(SOLO_JPEG_EXT_ADDR(__solo) + SOLO_JPEG_EXT_SIZE(__solo))
|
||||
|
|
Loading…
Reference in a new issue