[Scummvm-cvs-logs] SF.net SVN: scummvm:[50709] scummvm/trunk/backends/platform/ds

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Jul 5 22:36:43 CEST 2010


Revision: 50709
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50709&view=rev
Author:   fingolfin
Date:     2010-07-05 20:36:43 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
DS: Fix warning about anonymous struct

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
    scummvm/trunk/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h

Modified: scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.c	2010-07-05 20:36:11 UTC (rev 50708)
+++ scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.c	2010-07-05 20:36:43 UTC (rev 50709)
@@ -294,9 +294,9 @@
 {
 #ifdef NDS
 	return (
-		( ( (IPC->rtc_hours > 11 ? IPC->rtc_hours - 40 : IPC->rtc_hours) & 0x1F) << 11) |
-		( (IPC->rtc_minutes & 0x3F) << 5) |
-		( (IPC->rtc_seconds >> 1) & 0x1F) );
+		( ( (IPC->rtc.hours > 11 ? IPC->rtc.hours - 40 : IPC->rtc.hours) & 0x1F) << 11) |
+		( (IPC->rtc.minutes & 0x3F) << 5) |
+		( (IPC->rtc.seconds >> 1) & 0x1F) );
 #else
 	return 0;
 #endif
@@ -306,9 +306,9 @@
 {
 #ifdef NDS
 	return (
-		( ((IPC->rtc_year + 20) & 0x7F) <<9) |
-		( (IPC->rtc_month & 0xF) << 5) |
-		(IPC->rtc_day & 0x1F) );
+		( ((IPC->rtc.year + 20) & 0x7F) <<9) |
+		( (IPC->rtc.month & 0xF) << 5) |
+		(IPC->rtc.day & 0x1F) );
 #else
 	return 0;
 #endif

Modified: scummvm/trunk/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
===================================================================
--- scummvm/trunk/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h	2010-07-05 20:36:11 UTC (rev 50708)
+++ scummvm/trunk/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h	2010-07-05 20:36:43 UTC (rev 50709)
@@ -80,16 +80,16 @@
     uint8 curtime[8];        // current time response from RTC
 
     struct {
-      u8 rtc_command;
-      u8 rtc_year;           //add 2000 to get 4 digit year
-      u8 rtc_month;          //1 to 12
-      u8 rtc_day;            //1 to (days in month)
+      u8 command;
+      u8 year;           //add 2000 to get 4 digit year
+      u8 month;          //1 to 12
+      u8 day;            //1 to (days in month)
 
-      u8 rtc_incr;
-      u8 rtc_hours;          //0 to 11 for AM, 52 to 63 for PM
-      u8 rtc_minutes;        //0 to 59
-      u8 rtc_seconds;        //0 to 59
-    };
+      u8 incr;
+      u8 hours;          //0 to 11 for AM, 52 to 63 for PM
+      u8 minutes;        //0 to 59
+      u8 seconds;        //0 to 59
+    } rtc;
   };
 
   uint16 battery;            // battery life ??  hopefully.  :)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list