Changeset 27867

Timestamp:

01/04/09 14:50:44 (4 years ago)

Author:

takeru

Message:

gettimeofday

Location:

platform/wii/ruby_for_wii

Files:

• channels/rubwii/source/rubwii.c (modified) (2 diffs)
• channels/rubwii/test.rb (modified) (1 diff)
• ruby_1_8/common.mk (modified) (2 diffs)
• ruby_1_8/eval.c (modified) (1 diff)
• ruby_1_8/missing/strftime.c (modified) (1 diff)
• ruby_1_8/random.c (modified) (1 diff)
• ruby_1_8/time.c (modified) (1 diff)
• ruby_1_8/wii.c (moved) (moved from platform/wii/ruby_for_wii/ruby_1_8/missing/wii.c) (2 diffs, 1 prop)
• ruby_1_8/wii_io_net.c (moved) (moved from platform/wii/ruby_for_wii/ruby_1_8/missing/io_net.c) (1 prop)

platform/wii/ruby_for_wii/channels/rubwii/source/rubwii.c

@@ -194 +194 @@
 }
 
-void test_time(void)
-{
-  // timesupp.h
-  // time_t time(time_t *timer);
-  // unsigned int nanosleep(struct timespec *tb);
-  // timesupp.c
-  int i;
-  time_t t;
-  int ret;
-  struct timespec ts;
-  for(i=0; i<20; i++){
-    t = time(NULL);
-    ret = clock_gettime(&ts);
-    printf("%2d %10ld %10ld %20lu\n", i, t, ts.tv_sec, (unsigned long)ts.tv_nsec);
-    usleep(100*1000);
-  }
-}
-
 int main()
 {
@@ -253 +235 @@
   ret = rubwii_init();
   printf("rubwii_init:ret=%d\n", ret);
-
-  //test_time();
 
   count = 50000;

platform/wii/ruby_for_wii/channels/rubwii/test.rb

@@ -151 +151 @@
     break_flag = false
     console_clear
+
+    move_cursor(1,0)
+    puts Time.now.to_s
+    
     [0,1].each do |chan|
       wpad = Wii.wpad(chan)

platform/wii/ruby_for_wii/ruby_1_8/common.mk

@@ -59 +59 @@
                 variable.$(OBJEXT) \
                 version.$(OBJEXT) \
+                wii.$(OBJEXT) \
+                wii_io_net.$(OBJEXT) \
                 $(MISSING)
 
@@ -353 +355 @@
 dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
 ia64.$(OBJEXT): {$(VPATH)}ia64.s
-wii.$(OBJEXT): {$(VPATH)}wii.c
-io_net.$(OBJEXT): {$(VPATH)}io_net.c
         $(CC) $(CFLAGS) -c $<
 

platform/wii/ruby_for_wii/ruby_1_8/eval.c

@@ -18 +18 @@
 #include "util.h"
 #include "rubysig.h"
+#include "wii.h"
 
 #ifdef HAVE_STDLIB_H

platform/wii/ruby_for_wii/ruby_1_8/missing/strftime.c

@@ -47 +47 @@
 
 #include "config.h"
+#include "wii.h"
 
 #ifndef GAWK

platform/wii/ruby_for_wii/ruby_1_8/random.c

@@ -189 +189 @@
 #include <fcntl.h>
 #endif
+#include "wii.h"
 
 static VALUE saved_seed = INT2FIX(0);

platform/wii/ruby_for_wii/ruby_1_8/time.c

@@ -21 +21 @@
 
 #include <math.h>
+#include "wii.h"
 
 VALUE rb_cTime;

platform/wii/ruby_for_wii/ruby_1_8/wii.c

@@ -1 @@
-
 #include <stdio.h>
 #include <gctypes.h>
@@ -23 +22 @@
 #define GEKKO_NO_IMPL printf(ANSI_FG_YELLOW "*** GEKKO no impl func=%s\n" ANSI_FG_WHITE, __func__);
 
+//********************************************************
+// gettimeofday
+#include <sys/time.h>
+#include <ogc/lwp_watchdog.h>
+extern long long gettime(void);
+time_t    _ticktimer_reset_rtc  = 0;
+long long _ticktimer_reset_time = 0; // 64bit tick count.
+int wii_gettimeofday(struct timeval* tv)
+{
+  long long tim;
+  unsigned long us;
+
+  if(_ticktimer_reset_rtc==0 && _ticktimer_reset_time==0){
+    _ticktimer_reset_rtc  = time(NULL);
+    _ticktimer_reset_time = gettime();
+  }
+
+  tv->tv_sec  = 0;
+  tv->tv_usec = 0;
+  tim = gettime();
+  if(tim < _ticktimer_reset_time){
+    return -1; //FAILED
+  }
+
+  tv->tv_sec = _ticktimer_reset_rtc;
+  us = ticks_to_microsecs(tim - _ticktimer_reset_time);
+  tv->tv_sec  += us / 1000000;
+  tv->tv_usec += us % 1000000;
+  if(tv->tv_usec >= 1000000){
+    tv->tv_sec++;
+    tv->tv_usec -= 1000000;
+  }
+  return 0; //SUCCESS
+}
+// gettimeofday
+//********************************************************
+
+
 long select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, struct timeval *timeout)
 {