Changeset fd8302d in mainline

Timestamp:

2006-05-28T22:26:00Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a449065

Parents:

a6cb8cb

Message:

Correct realtime clock communication.

Location:

generic

Files:

• include/print.h (modified) (1 diff)
• src/time/clock.c (modified) (3 diffs)

generic/include/print.h

@@ -39 +39 @@
 #define EOF (-1)
 
-extern int puts(const char * str);
-
 extern int printf(const char *fmt, ...);
 extern int sprintf(char *str, const char *fmt, ...);

generic/src/time/clock.c

@@ -54 +54 @@
 /* Pointers to public variables with time */
 struct ptime {
-        __native seconds;
+        __native seconds1;
         __native useconds;
-        __native useconds2;
+        __native seconds2;
 };
 struct ptime *public_time;
@@ -83 +83 @@
 
         /* TODO: We would need some arch dependent settings here */
-        public_time->seconds = 0;
+        public_time->seconds1 = 0;
+        public_time->seconds2 = 0;
         public_time->useconds = 0; 
 
@@ -100 +101 @@
                 secfrag += 1000000/HZ;
                 if (secfrag >= 1000000) {
-                        public_time->useconds = 0;
+                        secfrag -= 1000000;
+                        public_time->seconds1++;
                         write_barrier();
-                        public_time->seconds++;
-                        secfrag = 0;
+                        public_time->useconds = secfrag;
+                        write_barrier();
+                        public_time->seconds2 = public_time->seconds1;
                 } else
                         public_time->useconds += 1000000/HZ;
-                write_barrier();
-                public_time->useconds2 = public_time->useconds;
-                write_barrier();
         }
 }