Skip to content

V
vlc
Commit 6b5ea562 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

cdrom.h: use static inline instead of macros

parent e83d098a
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
modules/access/vcd/cdrom.h
View file @ 6b5ea562
...@@ -60,10 +60,15 @@ enum { ...@@ -60,10 +60,15 @@ enum {
/***************************************************************************** /*****************************************************************************
* Misc. Macros * Misc. Macros
*****************************************************************************/ *****************************************************************************/
/* LBA = msf.frame + 75 * ( msf.second + 60 * msf.minute ) */ static inline int MSF_TO_LBA(uint8_t min, uint8_t sec, uint8_t frame)
#define MSF_TO_LBA(min, sec, frame) ((int)frame + 75 * (sec + 60 * min)) {
/* LBA = msf.frame + 75 * ( msf.second - 2 + 60 * msf.minute ) */ return (int)(frame + 75 * (sec + 60 * min));
#define MSF_TO_LBA2(min, sec, frame) ((int)frame + 75 * (sec -2 + 60 * min)) }
static inline int MSF_TO_LBA2(uint8_t min, uint8_t sec, uint8_t frame)
{
return (int)(frame + 75 * (sec -2 + 60 * min));
}
/* Converts BCD to Binary data */ /* Converts BCD to Binary data */
#define BCD_TO_BIN(i) \ #define BCD_TO_BIN(i) \
(uint8_t)((uint8_t)(0xf & (uint8_t)i)+((uint8_t)10*((uint8_t)i >> 4))) (uint8_t)((uint8_t)(0xf & (uint8_t)i)+((uint8_t)10*((uint8_t)i >> 4)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment