change log for rtems (2011-06-11)
rtems-vc at rtems.org
rtems-vc at rtems.org
Sat Jun 11 17:10:34 UTC 2011
*joel*:
2011-06-11 Joel Sherrill <joel.sherrill at oarcorp.com>
* fileio/init.c: Avoid use of deprecated rtems_clock_get() except in
spclockget().
M 1.190 testsuites/samples/ChangeLog
M 1.33 testsuites/samples/fileio/init.c
diff -u rtems/testsuites/samples/ChangeLog:1.189 rtems/testsuites/samples/ChangeLog:1.190
--- rtems/testsuites/samples/ChangeLog:1.189 Thu May 5 17:29:23 2011
+++ rtems/testsuites/samples/ChangeLog Sat Jun 11 11:41:56 2011
@@ -1,3 +1,8 @@
+2011-06-11 Joel Sherrill <joel.sherrill at oarcorp.com>
+
+ * fileio/init.c: Avoid use of deprecated rtems_clock_get() except in
+ spclockget().
+
2011-05-05 Joel Sherrill <joel.sherrill at oarcorp.com>
* fileio/Makefile.am, ticker/Makefile.am: Missed part of previous
diff -u rtems/testsuites/samples/fileio/init.c:1.32 rtems/testsuites/samples/fileio/init.c:1.33
--- rtems/testsuites/samples/fileio/init.c:1.32 Thu May 5 11:45:40 2011
+++ rtems/testsuites/samples/fileio/init.c Sat Jun 11 11:41:56 2011
@@ -286,7 +286,7 @@
}
if (fd >= 0) {
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &start_tick);
+ start_tick = rtems_clock_get_ticks_since_boot();
do {
n = read(fd,buf_ptr,buf_size);
if (n > 0) {
@@ -295,7 +295,7 @@
}
} while (n > 0);
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &curr_tick);
+ curr_tick = rtems_clock_get_ticks_since_boot();
printf("\n ******** End of file reached, flen = %zd\n",flen);
close(fd);
@@ -462,7 +462,7 @@
*/
if (!failed) {
printf("... writing to file\n");
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &start_tick);
+ start_tick = rtems_clock_get_ticks_since_boot();
curr_pos = 0;
do {
bytes_to_copy = buf_size;
@@ -476,7 +476,7 @@
}
} while ((bytes_to_copy > 0) && (n > 0));
} while ((file_size > curr_pos) && (n > 0));
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &curr_tick);
+ curr_tick = rtems_clock_get_ticks_since_boot();
if (n < 0) {
failed = true;
printf("*** file write failed, "
@@ -583,7 +583,7 @@
*/
if (!failed) {
printf("... reading from file\n");
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &start_tick);
+ start_tick = rtems_clock_get_ticks_since_boot();
curr_pos = 0;
do {
n = read(fd,
@@ -593,7 +593,7 @@
curr_pos += (size_t) n;
}
} while (n > 0);
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &curr_tick);
+ curr_tick = rtems_clock_get_ticks_since_boot();
if (n < 0) {
failed = true;
printf("*** file read failed, "
*joel*:
2011-06-11 Joel Sherrill <joel.sherrill at oarcorp.com>
* sp09/screen02.c, sp09/screen13.c, sp09/sp09.scn, sp29/init.c,
sp30/sp30.scn, sp32/init.c, spclockget/init.c: Avoid use of
deprecated rtems_clock_get() except in spclockget().
M 1.453 testsuites/sptests/ChangeLog
M 1.18 testsuites/sptests/sp09/screen02.c
M 1.16 testsuites/sptests/sp09/screen13.c
M 1.29 testsuites/sptests/sp09/sp09.scn
M 1.18 testsuites/sptests/sp29/init.c
M 1.4 testsuites/sptests/sp30/sp30.scn
M 1.11 testsuites/sptests/sp32/init.c
M 1.6 testsuites/sptests/spclockget/init.c
diff -u rtems/testsuites/sptests/ChangeLog:1.452 rtems/testsuites/sptests/ChangeLog:1.453
--- rtems/testsuites/sptests/ChangeLog:1.452 Fri May 20 09:07:52 2011
+++ rtems/testsuites/sptests/ChangeLog Sat Jun 11 11:42:05 2011
@@ -1,3 +1,9 @@
+2011-06-11 Joel Sherrill <joel.sherrill at oarcorp.com>
+
+ * sp09/screen02.c, sp09/screen13.c, sp09/sp09.scn, sp29/init.c,
+ sp30/sp30.scn, sp32/init.c, spclockget/init.c: Avoid use of
+ deprecated rtems_clock_get() except in spclockget().
+
2011-05-20 Sebastian Huber <sebastian.huber at embedded-brains.de>
* spintrcritical01/init.c: Fixed warning fix.
diff -u rtems/testsuites/sptests/sp09/screen02.c:1.17 rtems/testsuites/sptests/sp09/screen02.c:1.18
--- rtems/testsuites/sptests/sp09/screen02.c:1.17 Fri Apr 15 08:21:09 2011
+++ rtems/testsuites/sptests/sp09/screen02.c Sat Jun 11 11:42:05 2011
@@ -6,7 +6,7 @@
*
* Output parameters: NONE
*
- * COPYRIGHT (c) 1989-2009.
+ * COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -121,28 +121,10 @@
fatal_directive_status(
status,
RTEMS_INVALID_ADDRESS,
- "rtems_clock_get sull pointer"
+ "rtems_clock_set sull pointer"
);
puts( "TA1 - rtems_clock_set - RTEMS_INVALID_ADDRESS" );
- /* NULL parameter */
- status = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, NULL );
- fatal_directive_status(
- status,
- RTEMS_INVALID_ADDRESS,
- "rtems_clock_get null pointer"
- );
- puts( "TA1 - rtems_clock_get - RTEMS_INVALID_ADDRESS" );
-
- /* arbitrary bad value for switch */
- status = rtems_clock_get( 0xff, &tv );
- fatal_directive_status(
- status,
- RTEMS_INVALID_NUMBER,
- "rtems_clock_get bad case"
- );
- puts( "TA1 - rtems_clock_get - RTEMS_INVALID_NUMBER" );
-
/* wake when NULL param */
status = rtems_task_wake_when( NULL );
fatal_directive_status(
@@ -156,7 +138,7 @@
status = rtems_task_wake_when( &time );
if ( status == RTEMS_SUCCESSFUL ) {
puts(
- "TA1 - rtems_clock_get - RTEMS_NOT_DEFINED -- "
+ "TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED -- "
"DID BSP SET THE TIME OF DAY?"
);
} else {
diff -u rtems/testsuites/sptests/sp09/screen13.c:1.15 rtems/testsuites/sptests/sp09/screen13.c:1.16
--- rtems/testsuites/sptests/sp09/screen13.c:1.15 Tue Feb 22 01:36:58 2011
+++ rtems/testsuites/sptests/sp09/screen13.c Sat Jun 11 11:42:05 2011
@@ -6,7 +6,7 @@
*
* Output parameters: NONE
*
- * COPYRIGHT (c) 1989-2009.
+ * COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -85,8 +85,8 @@
print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
status = rtems_clock_get_tod( &time );
- directive_failed( status, "rtems_clock_set" );
- print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
+ directive_failed( status, "rtems_clock_get_tod" );
+ print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
build_time( &time, 12, 31, 2100, 23, 59, 59, 0 );
status = rtems_clock_set( &time );
diff -u rtems/testsuites/sptests/sp09/sp09.scn:1.28 rtems/testsuites/sptests/sp09/sp09.scn:1.29
--- rtems/testsuites/sptests/sp09/sp09.scn:1.28 Thu May 5 11:45:57 2011
+++ rtems/testsuites/sptests/sp09/sp09.scn Sat Jun 11 11:42:05 2011
@@ -35,8 +35,6 @@
TA1 - rtems_clock_get_tod_timeval - RTEMS_NOT_DEFINED
TA1 - rtems_clock_set_nanoseconds_extension - RTEMS_INVALID_ADDRESS
TA1 - rtems_clock_set - RTEMS_INVALID_ADDRESS
-TA1 - rtems_clock_get - RTEMS_INVALID_ADDRESS
-TA1 - rtems_clock_get - RTEMS_INVALID_NUMBER
TA1 - rtems_task_wake_when - RTEMS_INVALID_ADDRESS
TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED
TA1 - rtems_timer_fire_when - RTEMS_NOT_DEFINED
@@ -175,8 +173,9 @@
TA3 - rtems_message_queue_receive - woke up with RTEMS_OBJECT_WAS_DELETED
TA3 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL
<pause - screen 9>
-TA1 - rtems_interrupt_catch - bad handler RTEMS_INVALID_ADDRESS -- SKIPPED
-TA1 - rtems_interrupt_catch - old isr RTEMS_INVALID_ADDRESS - SKIPPED
+TA1 - rtems_interrupt_catch - RTEMS_INVALID_NUMBER
+TA1 - rtems_interrupt_catch - bad handler RTEMS_INVALID_ADDRESS
+TA1 - rtems_interrupt_catch - old isr RTEMS_INVALID_ADDRESS
TA1 - rtems_signal_send - RTEMS_INVALID_ID
TA1 - rtems_signal_send - RTEMS_INVALID_NUMBER
TA1 - rtems_signal_send - RTEMS_NOT_DEFINED
@@ -286,7 +285,7 @@
TA1 - rtems_clock_set - 23:59:59 12/31/2000 - RTEMS_SUCCESSFUL
TA1 - rtems_clock_get_tod - 00:00:00 01/01/2001 - RTEMS_SUCCESSFUL
TA1 - rtems_clock_set - 23:59:59 12/31/1999 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 00:00:00 01/01/2000 - RTEMS_SUCCESSFUL
+TA1 - rtems_clock_get_tod - 00:00:00 01/01/2000 - RTEMS_SUCCESSFUL
TA1 - rtems_clock_set - 23:59:59 12/31/2100 - RTEMS_SUCCESSFUL
TA1 - rtems_clock_get_tod - 17:31:44 11/25/1964 - RTEMS_SUCCESSFUL
TA1 - rtems_clock_set - 23:59:59 12/31/2099 - RTEMS_SUCCESSFUL
diff -u rtems/testsuites/sptests/sp29/init.c:1.17 rtems/testsuites/sptests/sp29/init.c:1.18
--- rtems/testsuites/sptests/sp29/init.c:1.17 Tue Feb 22 01:37:00 2011
+++ rtems/testsuites/sptests/sp29/init.c Sat Jun 11 11:42:05 2011
@@ -165,9 +165,9 @@
* Since this task is holding this, this task will block and timeout.
* Then the timeout error will be returned.
*/
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
+ then = rtems_clock_get_ticks_since_boot();
sc = rtems_semaphore_obtain (semnorec, RTEMS_WAIT, 5);
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+ now = rtems_clock_get_ticks_since_boot();
if (sc == RTEMS_SUCCESSFUL) {
printf ("%d: Reobtain non-recursive-lock semaphore -- and should not have.\n", __LINE__);
}
@@ -178,12 +178,12 @@
printf ("%d: Reobtain non-recursive-lock semaphore failed without timeout.\n", __LINE__);
startTask (semnorec);
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
+ then = rtems_clock_get_ticks_since_boot();
for (i = 0 ; i < 5 ; i++) {
rtems_interval diff;
sc = rtems_semaphore_obtain (semnorec, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
- rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+ now = rtems_clock_get_ticks_since_boot();
diff = (now - then);
then = now;
if (sc != RTEMS_SUCCESSFUL)
diff -u rtems/testsuites/sptests/sp30/sp30.scn:1.3 rtems/testsuites/sptests/sp30/sp30.scn:1.4
--- rtems/testsuites/sptests/sp30/sp30.scn:1.3 Fri Dec 14 11:44:15 2007
+++ rtems/testsuites/sptests/sp30/sp30.scn Sat Jun 11 11:42:05 2011
@@ -2,18 +2,18 @@
timer_initiate_server -- INVALID_PRIORITY
timer_initiate_server -- OK
timer_initiate_server -- already started
-TA1 - rtems_clock_get - 09:00:00 12/31/1988
-TA2 - rtems_clock_get - 09:00:00 12/31/1988
-TA3 - rtems_clock_get - 09:00:00 12/31/1988
-TA1 - rtems_clock_get - 09:00:05 12/31/1988
-TA2 - rtems_clock_get - 09:00:10 12/31/1988
-TA1 - rtems_clock_get - 09:00:10 12/31/1988
-TA1 - rtems_clock_get - 09:00:15 12/31/1988
-TA3 - rtems_clock_get - 09:00:15 12/31/1988
-TA2 - rtems_clock_get - 09:00:20 12/31/1988
-TA1 - rtems_clock_get - 09:00:20 12/31/1988
-TA1 - rtems_clock_get - 09:00:25 12/31/1988
-TA2 - rtems_clock_get - 09:00:30 12/31/1988
-TA1 - rtems_clock_get - 09:00:30 12/31/1988
-TA3 - rtems_clock_get - 09:00:30 12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:00 12/31/1988
+TA2 - rtems_clock_get_tod - 09:00:00 12/31/1988
+TA3 - rtems_clock_get_tod - 09:00:00 12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:05 12/31/1988
+TA2 - rtems_clock_get_tod - 09:00:10 12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:10 12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:15 12/31/1988
+TA3 - rtems_clock_get_tod - 09:00:15 12/31/1988
+TA2 - rtems_clock_get_tod - 09:00:20 12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:20 12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:25 12/31/1988
+TA2 - rtems_clock_get_tod - 09:00:30 12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:30 12/31/1988
+TA3 - rtems_clock_get_tod - 09:00:30 12/31/1988
*** END OF TEST 30 ***
diff -u rtems/testsuites/sptests/sp32/init.c:1.10 rtems/testsuites/sptests/sp32/init.c:1.11
--- rtems/testsuites/sptests/sp32/init.c:1.10 Tue Feb 22 01:37:00 2011
+++ rtems/testsuites/sptests/sp32/init.c Sat Jun 11 11:42:05 2011
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2009.
+ * COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -39,8 +39,7 @@
directive_failed(status, "rate_monotonic_period #1");
/* get our first timestamp */
- status = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, ×tamps[0] );
- directive_failed(status, "clock_get");
+ timestamps[0] = rtems_clock_get_ticks_since_boot();
/* loop through and gather more timestamps */
for (loopy = 1; loopy < 5; loopy++) {
@@ -48,11 +47,7 @@
status = rtems_rate_monotonic_period( period_id, wantintervals[loopy] );
directive_failed(status, "rate_monotonic_period #2");
- status = rtems_clock_get(
- RTEMS_CLOCK_GET_TICKS_SINCE_BOOT,
- ×tamps[loopy]
- );
- directive_failed(status, "clock_get");
+ timestamps[loopy] = rtems_clock_get_ticks_since_boot();
}
/* block one last time */
@@ -60,11 +55,7 @@
directive_failed(status, "rate_monotonic_period #3");
/* get one last timestamp */
- status = rtems_clock_get(
- RTEMS_CLOCK_GET_TICKS_SINCE_BOOT,
- ×tamps[loopy]
- );
- directive_failed(status, "clock_get");
+ timestamps[loopy] = rtems_clock_get_ticks_since_boot();
/* cancel the period */
status = rtems_rate_monotonic_cancel(period_id);
diff -u rtems/testsuites/sptests/spclockget/init.c:1.5 rtems/testsuites/sptests/spclockget/init.c:1.6
--- rtems/testsuites/sptests/spclockget/init.c:1.5 Tue Feb 22 01:37:02 2011
+++ rtems/testsuites/sptests/spclockget/init.c Sat Jun 11 11:42:05 2011
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2009.
+ * COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -31,6 +31,16 @@
sc = rtems_clock_set( &time );
directive_failed( sc, "rtems_clock_set" );
+ /* NULL parameter */
+ sc = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, NULL );
+ fatal_directive_status( sc, RTEMS_INVALID_ADDRESS, "null pointer" );
+ puts( "TA1 - rtems_clock_get - RTEMS_INVALID_ADDRESS" );
+
+ /* arbitrary bad value for switch */
+ sc = rtems_clock_get( 0xff, &timev );
+ fatal_directive_status( sc, RTEMS_INVALID_NUMBER, "bad case" );
+ puts( "TA1 - rtems_clock_get - RTEMS_INVALID_NUMBER" );
+
sc = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
directive_failed( sc, "rtems_clock_get -- TOD" );
print_time( "Init - rtems_clock_get - ", &time, "\n" );
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110611/e7acc62a/attachment.html>
More information about the vc
mailing list