From 764c0dd2c13d4458ebe293b5ced5be88523b35f6 Mon Sep 17 00:00:00 2001 From: David Voswinkel Date: Thu, 14 May 2009 20:22:39 +0200 Subject: [PATCH] o compiles and still crashes --- poc/avr_usbload/main.c | 3 +- snesram.tmproj | 460 ++++++++++++++++++------ tools/bsnes/Makefile | 2 +- tools/bsnes/cc.bat | 3 - tools/bsnes/clean.bat | 1 - tools/bsnes/lib/ruby/video/sdl.cpp | 8 +- tools/bsnes/ui_qt/resource/resource.rcc | 2 +- 7 files changed, 359 insertions(+), 120 deletions(-) delete mode 100755 tools/bsnes/cc.bat delete mode 100755 tools/bsnes/clean.bat diff --git a/poc/avr_usbload/main.c b/poc/avr_usbload/main.c index 43f11ef..1d2fb42 100644 --- a/poc/avr_usbload/main.c +++ b/poc/avr_usbload/main.c @@ -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; diff --git a/snesram.tmproj b/snesram.tmproj index 97c9a75..f88030b 100644 --- a/snesram.tmproj +++ b/snesram.tmproj @@ -3,7 +3,7 @@ currentDocument - poc/avr_usbload/main.c + tools/bsnes/lib/nall/lzss.hpp documents @@ -254,14 +254,14 @@ caret column - 22 + 0 line - 55 + 56 firstVisibleColumn 0 firstVisibleLine - 15 + 4 poc/avr_usbload/requests.h @@ -587,21 +587,21 @@ firstVisibleLine 0 - tools/bsnes/cart/cart.cpp + tools/bsnes/Makefile caret column - 0 + 10 line - 95 + 8 firstVisibleColumn 0 firstVisibleLine - 44 + 0 - tools/bsnes/cart/cart.hpp + tools/bsnes/lib/nall/algorithm.hpp caret @@ -613,7 +613,245 @@ firstVisibleColumn 0 firstVisibleLine - 24 + 0 + + tools/bsnes/lib/nall/any.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/nall/config.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/nall/crc32.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/nall/endian.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/nall/lzss.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/nall/new.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/nall/static.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/nall/stdint.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/ruby/audio/ao.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/ruby/audio/ao.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/ruby/audio/openal.cpp + + caret + + column + 14 + line + 1 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/ruby/ruby.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 266 + + tools/bsnes/lib/ruby/ruby.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 55 + + tools/bsnes/lib/ruby/ruby_audio.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 68 + + tools/bsnes/lib/ruby/ruby_impl.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/ruby/video.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/lib/ruby/video/sdl.cpp + + caret + + column + 16 + line + 103 + + firstVisibleColumn + 0 + firstVisibleLine + 85 tools/bsnes/memory/smemory/mapper/chip.cpp @@ -671,6 +909,64 @@ firstVisibleLine 0 + tools/bsnes/ui_qt/Makefile + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/ui_qt/main.cpp + + caret + + column + 11 + line + 136 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 110 + selectFrom + + column + 4 + line + 136 + + selectTo + + column + 11 + line + 136 + + + tools/bsnes/ui_qt/platform.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 48 + tools/usbload/avr.mk caret @@ -1125,12 +1421,6 @@ snes/crc/event.c snes/crc/main.c poc/avr_sdcard/mmc.c - tools/bsnes/cart/cart.cpp - tools/bsnes/memory/smemory/mapper/chip.cpp - tools/bsnes/memory/smemory/mapper/generic.cpp - tools/bsnes/memory/smemory/mapper/system.cpp - tools/bsnes/memory/smemory/smemory.cpp - tools/bsnes/cart/cart.hpp poc/avr_sdcard/main.c poc/avr_usbload/crc.c poc/avr_usbload/crc.h @@ -1165,6 +1455,28 @@ tools/vusb/examples/custom-class/commandline/set-led.c tools/vusb/examples/custom-class/Readme.txt poc/avr_usbload/main.c + tools/bsnes/Makefile + tools/bsnes/ui_qt/Makefile + tools/bsnes/lib/ruby/audio/openal.cpp + tools/bsnes/lib/ruby/video.hpp + tools/bsnes/lib/ruby/video/sdl.cpp + tools/bsnes/lib/ruby/ruby_impl.cpp + tools/bsnes/lib/ruby/ruby_audio.cpp + tools/bsnes/lib/ruby/ruby.hpp + tools/bsnes/lib/ruby/ruby.cpp + tools/bsnes/lib/nall/algorithm.hpp + tools/bsnes/lib/nall/any.hpp + tools/bsnes/lib/nall/config.hpp + tools/bsnes/lib/nall/crc32.hpp + tools/bsnes/lib/nall/endian.hpp + tools/bsnes/lib/nall/static.hpp + tools/bsnes/lib/nall/stdint.hpp + tools/bsnes/lib/nall/new.hpp + tools/bsnes/lib/nall/lzss.hpp + tools/bsnes/ui_qt/main.cpp + tools/bsnes/ui_qt/platform.cpp + tools/bsnes/lib/ruby/audio/ao.cpp + tools/bsnes/lib/ruby/audio/ao.hpp poc/avr_usbload/uart.h poc/avr_usbload/commandline/Makefile poc/avr_usbload/commandline/snesuploader.c @@ -1191,29 +1503,6 @@ subItems - poc - - isExpanded - - subItems - - avr_usbload - - isExpanded - - subItems - - commandline - - isExpanded - - subItems - - - - - - scripts isExpanded @@ -1221,106 +1510,55 @@ subItems - snes - - isExpanded - - subItems - - tools isExpanded subItems - vusb + bsnes isExpanded subItems - examples + lib isExpanded subItems - custom-class - - isExpanded - - subItems - - commandline - - isExpanded - - subItems - - - firmware - - isExpanded - - subItems - - - - - hid-custom-rq - - isExpanded - - subItems - - firmware - - isExpanded - - subItems - - - - - hid-data - - isExpanded - - subItems - - commandline - - isExpanded - - subItems - - - firmware - - isExpanded - - subItems - - - - - hid-mouse + nall isExpanded subItems - usbtool + ruby isExpanded subItems - + + video + + isExpanded + + subItems + + + + ui_qt + + isExpanded + + subItems + + @@ -1329,6 +1567,6 @@ windowFrame - {{4, 56}, {733, 822}} + {{0, 60}, {720, 818}} diff --git a/tools/bsnes/Makefile b/tools/bsnes/Makefile index f1be501..9bfd702 100755 --- a/tools/bsnes/Makefile +++ b/tools/bsnes/Makefile @@ -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 := diff --git a/tools/bsnes/cc.bat b/tools/bsnes/cc.bat deleted file mode 100755 index d8ae3c6..0000000 --- a/tools/bsnes/cc.bat +++ /dev/null @@ -1,3 +0,0 @@ -@mingw32-make -::@mingw32-make enable_gzip=true enable_jma=true -@pause diff --git a/tools/bsnes/clean.bat b/tools/bsnes/clean.bat deleted file mode 100755 index d8bb7e0..0000000 --- a/tools/bsnes/clean.bat +++ /dev/null @@ -1 +0,0 @@ -@mingw32-make clean diff --git a/tools/bsnes/lib/ruby/video/sdl.cpp b/tools/bsnes/lib/ruby/video/sdl.cpp index f91cac0..02faf9c 100755 --- a/tools/bsnes/lib/ruby/video/sdl.cpp +++ b/tools/bsnes/lib/ruby/video/sdl.cpp @@ -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; } diff --git a/tools/bsnes/ui_qt/resource/resource.rcc b/tools/bsnes/ui_qt/resource/resource.rcc index 67a169a..6e2fc93 100644 --- a/tools/bsnes/ui_qt/resource/resource.rcc +++ b/tools/bsnes/ui_qt/resource/resource.rcc @@ -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!