diff options
| -rw-r--r-- | firmware/common/timefuncs.c | 25 | ||||
| -rw-r--r-- | firmware/include/timefuncs.h | 1 | ||||
| -rw-r--r-- | firmware/usbstack/usb_storage.c | 25 |
3 files changed, 25 insertions, 26 deletions
diff --git a/firmware/common/timefuncs.c b/firmware/common/timefuncs.c index 774fba9..405bce4 100644 --- a/firmware/common/timefuncs.c +++ b/firmware/common/timefuncs.c @@ -204,28 +204,3 @@ void set_day_of_week(struct tm *tm) if(m == 0 || m == 1) y--; tm->tm_wday = (d + mo[m] + y + y/4 - y/100 + y/400) % 7; } - -void yearday_to_daymonth(int yd, int y, int *d, int *m) -{ - static const char tnl[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; - static const char tl[] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; - const char *t; - int i=0; - - if((y%4 == 0 && y%100 != 0) || y%400 == 0) - { - t=tl; - } - else - { - t=tnl; - } - - while(yd >= t[i] && i<12) - { - yd-=t[i]; - i++; - } - *d = yd+1; - *m = i; -} diff --git a/firmware/include/timefuncs.h b/firmware/include/timefuncs.h index e9ef807..ab566d9 100644 --- a/firmware/include/timefuncs.h +++ b/firmware/include/timefuncs.h @@ -30,7 +30,6 @@ struct tm *get_time(void); int set_time(const struct tm *tm); bool valid_time(const struct tm *tm); void set_day_of_week(struct tm *tm); -void yearday_to_daymonth(int yd, int y, int *d, int *m); #if CONFIG_RTC time_t mktime(struct tm *t); #endif diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c index a3664b0..e6a45e6 100644 --- a/firmware/usbstack/usb_storage.c +++ b/firmware/usbstack/usb_storage.c @@ -295,6 +295,31 @@ static enum { SENDING_CSW } state = WAITING_FOR_COMMAND; +static void yearday_to_daymonth(int yd, int y, int *d, int *m) +{ + static const char tnl[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + static const char tl[] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + const char *t; + int i=0; + + if((y%4 == 0 && y%100 != 0) || y%400 == 0) + { + t=tl; + } + else + { + t=tnl; + } + + while(yd >= t[i] && i<12) + { + yd-=t[i]; + i++; + } + *d = yd+1; + *m = i; +} + #ifdef TOSHIBA_GIGABEAT_S /* The Gigabeat S factory partition table contains invalid values for the |