struct tm alarm_tm = { 0, };
if (start->year != 0) {
- alarm_tm.tm_year = start->year - 1900;
- alarm_tm.tm_mon = start->month - 1;
- alarm_tm.tm_mday = start->day;
+ if ((alarm_info->alarm_type & ALARM_TYPE_RELATIVE) && alarm_info->reserved_info != 0) {
+ __alarm_info->start = alarm_info->reserved_info;
+ } else {
+ alarm_tm.tm_year = start->year - 1900;
+ alarm_tm.tm_mon = start->month - 1;
+ alarm_tm.tm_mday = start->day;
- alarm_tm.tm_hour = start->hour;
- alarm_tm.tm_min = start->min;
- alarm_tm.tm_sec = start->sec;
- alarm_tm.tm_isdst = -1;
+ alarm_tm.tm_hour = start->hour;
+ alarm_tm.tm_min = start->min;
+ alarm_tm.tm_sec = start->sec;
+ alarm_tm.tm_isdst = -1;
- __alarm_info->start = mktime(&alarm_tm);
+ __alarm_info->start = mktime(&alarm_tm);
+ }
} else {
__alarm_info->start = 0;
}
__alarm_info_t *entry = NULL;
struct tm *p_time = NULL ;
struct tm due_time_result ;
- struct tm fixed_time = { 0, };
is_time_changed = true;
tzset();
start->hour = p_time->tm_hour;
start->min = p_time->tm_min;
start->sec = p_time->tm_sec;
-
- end->year = p_time->tm_year + 1900;
- end->month = p_time->tm_mon + 1;
- end->day = p_time->tm_mday;
-
- memset(&fixed_time, 0, sizeof(fixed_time));
- fixed_time.tm_year = p_time->tm_year;
- fixed_time.tm_mon = p_time->tm_mon;
- fixed_time.tm_mday = p_time->tm_mday;
- fixed_time.tm_hour = 0;
- fixed_time.tm_min = 0;
- fixed_time.tm_sec = 0;
}
- entry->start = mktime(&fixed_time);
-
- fixed_time.tm_hour = 23;
- fixed_time.tm_min = 59;
- fixed_time.tm_sec = 59;
+ if (entry->start != 0) {
+ entry->start = entry->due_time;
+ }
- entry->end = mktime(&fixed_time);
+ if (entry->end != 0) {
+ entry->end += diff_time;
+ p_time = localtime_r(&entry->end, &due_time_result);
+ if (p_time != NULL) {
+ end->year = p_time->tm_year + 1900;
+ end->month = p_time->tm_mon + 1;
+ end->day = p_time->tm_mday;
+ end->hour = p_time->tm_hour;
+ end->min = p_time->tm_min;
+ end->sec = p_time->tm_sec;
+ }
+ }
}
_alarm_next_duetime(entry);
}
time_t standard_time = _get_periodic_alarm_standard_time();
localtime_r(&standard_time, &standard_tm);
+ alarm_info.reserved_info = standard_time;
+
alarm_info.start.year = standard_tm.tm_year + 1900;
alarm_info.start.month = standard_tm.tm_mon + 1;
alarm_info.start.day = standard_tm.tm_mday;
alarm_info.alarm_type |= ALARM_TYPE_RELATIVE;
alarm_info.alarm_type |= ALARM_TYPE_WITHCB;
alarm_info.alarm_type |= ALARM_TYPE_PERIOD;
- alarm_info.reserved_info = 0;
if (interval <= 0) {
alarm_info.mode.repeat = ALARM_REPEAT_MODE_ONCE;
} else {
current_time.tv_sec += trigger_at_time;
}
+ alarm_info.reserved_info = current_time.tv_sec;
tzset(); /* Processes the TZ environment variable, and Set timezone, daylight, and tzname. */
localtime_r(¤t_time.tv_sec, &duetime_tm);
} else {
current_time.tv_sec += trigger_at_time;
}
+ alarm_info.reserved_info = current_time.tv_sec;
tzset(); /* Processes the TZ environment variable, and Set timezone, daylight, and tzname. */
localtime_r(¤t_time.tv_sec, &duetime_tm);
} else {
current_time.tv_sec += trigger_at_time;
}
+ alarm_info.reserved_info = current_time.tv_sec;
tzset(); /* Processes the TZ environment variable, and Set timezone, daylight, and tzname. */
localtime_r(¤t_time.tv_sec, &duetime_tm);