godzil/quickdev16
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

o compiles and still crashes

Browse Source
This commit is contained in:
David Voswinkel
2009-05-14 20:22:39 +02:00
parent a1763efe21
commit 764c0dd2c1
7 changed files with 359 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
poc/avr_usbload/main.c
View File

@@ -53,7 +53,8 @@ void crc_check_memory(uint32_t top_addr)
}
void crc_check_memory_range(uint32_t start_addr, uint32_t size)
void crc_check_memory_
range(uint32_t start_addr, uint32_t size)
{
uint16_t crc = 0;
uint32_t addr;

460
snesram.tmproj
View File

@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>currentDocument</key>
<string>poc/avr_usbload/main.c</string>
<string>tools/bsnes/lib/nall/lzss.hpp</string>
<key>documents</key>
<array>
<dict>
@@ -254,14 +254,14 @@
<key>caret</key>
<dict>
<key>column</key>
<integer>22</integer>
<integer>0</integer>
<key>line</key>
<integer>55</integer>
<integer>56</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>15</integer>
<integer>4</integer>
</dict>
<key>poc/avr_usbload/requests.h</key>
<dict>
@@ -587,21 +587,21 @@
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/cart/cart.cpp</key>
<key>tools/bsnes/Makefile</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<integer>10</integer>
<key>line</key>
<integer>95</integer>
<integer>8</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>44</integer>
<integer>0</integer>
</dict>
<key>tools/bsnes/cart/cart.hpp</key>
<key>tools/bsnes/lib/nall/algorithm.hpp</key>
<dict>
<key>caret</key>
<dict>
@@ -613,7 +613,245 @@
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>24</integer>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/nall/any.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/nall/config.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/nall/crc32.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/nall/endian.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/nall/lzss.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/nall/new.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/nall/static.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/nall/stdint.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/ruby/audio/ao.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/ruby/audio/ao.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/ruby/audio/openal.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>14</integer>
<key>line</key>
<integer>1</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/ruby/ruby.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>266</integer>
</dict>
<key>tools/bsnes/lib/ruby/ruby.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>55</integer>
</dict>
<key>tools/bsnes/lib/ruby/ruby_audio.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>68</integer>
</dict>
<key>tools/bsnes/lib/ruby/ruby_impl.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/ruby/video.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/lib/ruby/video/sdl.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>16</integer>
<key>line</key>
<integer>103</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>85</integer>
</dict>
<key>tools/bsnes/memory/smemory/mapper/chip.cpp</key>
<dict>
@@ -671,6 +909,64 @@
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/ui_qt/Makefile</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/ui_qt/main.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>11</integer>
<key>line</key>
<integer>136</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>110</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>4</integer>
<key>line</key>
<integer>136</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>11</integer>
<key>line</key>
<integer>136</integer>
</dict>
</dict>
<key>tools/bsnes/ui_qt/platform.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>48</integer>
</dict>
<key>tools/usbload/avr.mk</key>
<dict>
<key>caret</key>
@@ -1125,12 +1421,6 @@
<string>snes/crc/event.c</string>
<string>snes/crc/main.c</string>
<string>poc/avr_sdcard/mmc.c</string>
<string>tools/bsnes/cart/cart.cpp</string>
<string>tools/bsnes/memory/smemory/mapper/chip.cpp</string>
<string>tools/bsnes/memory/smemory/mapper/generic.cpp</string>
<string>tools/bsnes/memory/smemory/mapper/system.cpp</string>
<string>tools/bsnes/memory/smemory/smemory.cpp</string>
<string>tools/bsnes/cart/cart.hpp</string>
<string>poc/avr_sdcard/main.c</string>
<string>poc/avr_usbload/crc.c</string>
<string>poc/avr_usbload/crc.h</string>
@@ -1165,6 +1455,28 @@
<string>tools/vusb/examples/custom-class/commandline/set-led.c</string>
<string>tools/vusb/examples/custom-class/Readme.txt</string>
<string>poc/avr_usbload/main.c</string>
<string>tools/bsnes/Makefile</string>
<string>tools/bsnes/ui_qt/Makefile</string>
<string>tools/bsnes/lib/ruby/audio/openal.cpp</string>
<string>tools/bsnes/lib/ruby/video.hpp</string>
<string>tools/bsnes/lib/ruby/video/sdl.cpp</string>
<string>tools/bsnes/lib/ruby/ruby_impl.cpp</string>
<string>tools/bsnes/lib/ruby/ruby_audio.cpp</string>
<string>tools/bsnes/lib/ruby/ruby.hpp</string>
<string>tools/bsnes/lib/ruby/ruby.cpp</string>
<string>tools/bsnes/lib/nall/algorithm.hpp</string>
<string>tools/bsnes/lib/nall/any.hpp</string>
<string>tools/bsnes/lib/nall/config.hpp</string>
<string>tools/bsnes/lib/nall/crc32.hpp</string>
<string>tools/bsnes/lib/nall/endian.hpp</string>
<string>tools/bsnes/lib/nall/static.hpp</string>
<string>tools/bsnes/lib/nall/stdint.hpp</string>
<string>tools/bsnes/lib/nall/new.hpp</string>
<string>tools/bsnes/lib/nall/lzss.hpp</string>
<string>tools/bsnes/ui_qt/main.cpp</string>
<string>tools/bsnes/ui_qt/platform.cpp</string>
<string>tools/bsnes/lib/ruby/audio/ao.cpp</string>
<string>tools/bsnes/lib/ruby/audio/ao.hpp</string>
<string>poc/avr_usbload/uart.h</string>
<string>poc/avr_usbload/commandline/Makefile</string>
<string>poc/avr_usbload/commandline/snesuploader.c</string>
@@ -1191,29 +1503,6 @@
<true/>
<key>subItems</key>
<dict>
<key>poc</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>avr_usbload</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>commandline</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
</dict>
</dict>
</dict>
</dict>
<key>scripts</key>
<dict>
<key>isExpanded</key>
@@ -1221,106 +1510,55 @@
<key>subItems</key>
<dict/>
</dict>
<key>snes</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
<key>tools</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>vusb</key>
<key>bsnes</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>examples</key>
<key>lib</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>custom-class</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>commandline</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
<key>firmware</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
</dict>
</dict>
<key>hid-custom-rq</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>firmware</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
</dict>
</dict>
<key>hid-data</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>commandline</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
<key>firmware</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
</dict>
</dict>
<key>hid-mouse</key>
<key>nall</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
<key>usbtool</key>
<key>ruby</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
<dict>
<key>video</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
</dict>
</dict>
</dict>
</dict>
<key>ui_qt</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
</dict>
</dict>
</dict>
@@ -1329,6 +1567,6 @@
</dict>
</dict>
<key>windowFrame</key>
<string>{{4, 56}, {733, 822}}</string>
<string>{{0, 60}, {720, 818}}</string>
</dict>
</plist>

2
tools/bsnes/Makefile
View File

@@ -12,7 +12,7 @@ enable_gzip=false
c := $(compiler)
cpp := $(subst cc,++,$(compiler))
flags := -ggdb -O3 -fomit-frame-pointer -Ilib
flags := -ggdb3 -O3 -fomit-frame-pointer -Ilib
link :=

3
tools/bsnes/cc.bat
View File

@@ -1,3 +0,0 @@
@mingw32-make
::@mingw32-make enable_gzip=true enable_jma=true
@pause

1
tools/bsnes/clean.bat
View File

@@ -1 +0,0 @@
@mingw32-make clean

8
tools/bsnes/lib/ruby/video/sdl.cpp
View File

@@ -102,14 +102,18 @@ public:
char env[512];
sprintf(env, "SDL_WINDOWID=%ld", settings.handle);
putenv(env);
printf("init sdl\n");
SDL_InitSubSystem(SDL_INIT_VIDEO);
//screen depth must be 32, as 24bpp with a 32-bit X window visual produces no output.
screen = SDL_SetVideoMode(2560, 1600, 32, SDL_HWSURFACE);
printf("init screen\n");
screen = SDL_SetVideoMode(800, 600, 32, SDL_HWSURFACE);
//makescreen = SDL_SetVideoMode(2560, 1600, 32, SDL_HWSURFACE);
//buffer depth must be 32, as this is the input format used by all ruby drivers.
printf("init surface\n");
buffer = SDL_CreateRGBSurface(SDL_HWSURFACE,
1024, 1024, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000
);
printf("init done\n");
return true;
}

2
tools/bsnes/ui_qt/resource/resource.rcc
View File

@@ -1,7 +1,7 @@
/****************************************************************************
** Resource object code
**
** Created: Tue May 12 22:50:12 2009
** Created: Wed May 13 23:30:06 2009
** by: The Resource Compiler for Qt version 4.4.3
**
** WARNING! All changes made in this file will be lost!