Removing duplicate content and adding GPL header

svn-id: r30555
2026-06-20 05:45:29 +00:00 · 2008-01-18 17:37:07 +00:00
parent 4ba2df8792
commit bc0c66287c
1 changed files with 23 additions and 95 deletions
@@ -1,3 +1,26 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */

 #ifndef SCUMMVM_IPC_INCLUDE
 #define SCUMMVM_IPC_INCLUDE
@@ -89,98 +112,3 @@ typedef struct scummvmTransferRegion {


 #endif
-
-
-
-#ifndef SCUMMVM_IPC_INCLUDE
-#define SCUMMVM_IPC_INCLUDE
-
-//////////////////////////////////////////////////////////////////////
-
-#include <nds/jtypes.h>
-#include <nds/ipc.h>
-
-//////////////////////////////////////////////////////////////////////
-
- 
-typedef struct _adpcmBuffer {
-	u8* buffer[8];
-	bool filled[8];
-	u8* arm7Buffer[8];
-	bool arm7Dirty[8];
-	bool semaphore;
-} adpcmBuffer;
- 
-//////////////////////////////////////////////////////////////////////
-
-typedef struct scummvmTransferRegion {
-  uint32 heartbeat;          // counts frames
- 
-   int16 touchX,   touchY;   // TSC X, Y
-   int16 touchXpx, touchYpx; // TSC X, Y pixel values
-   int16 touchZ1,  touchZ2;  // TSC x-panel measurements
-  uint16 tdiode1,  tdiode2;  // TSC temperature diodes
-  uint32 temperature;        // TSC computed temperature
- 
-  uint16 buttons;            // X, Y, /PENIRQ buttons
- 
-  union {
-    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 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
-    };
-  };
- 
-  uint16 battery;            // battery life ??  hopefully.  :)
-  uint16 aux;                // i have no idea...
- 
-  pTransferSound soundData;
-  
-  adpcmBuffer adpcm;
-  
- 
-  // Don't rely on these below, will change or be removed in the future
-  vuint32 mailAddr;
-  vuint32 mailData;
-  vuint8 mailRead;
-  vuint8 mailBusy;
-  vuint32 mailSize;
-  
-  bool performArm9SleepMode;
-  
-  u32 test;
-  int tweak;
-  bool tweakChanged;
-  
-//  bool fillSoundFirstHalf;
-//  bool fillSoundSecondHalf;
-
-  // These are used for ScummVMs sound output
-  bool fillNeeded[4];
-  int playingSection;
-  
-  bool reset;
-  
-  // Streaming sound
-  bool streamFillNeeded[4];
-  int streamPlayingSection;
-} scummTransferRegion, * pscummTransferRegion;
-
-//////////////////////////////////////////////////////////////////////
-
-#undef IPC
-#define IPC ((scummTransferRegion volatile *)(0x027FF000))
-
-
-#endif
-
-