diff -ru src/zaurus/InfoNES_System_Zaurus.cpp /home/fbriere/fbuild/root/src/zaurus/InfoNES_System_Zaurus.cpp --- src/zaurus/InfoNES_System_Zaurus.cpp 2004-07-31 17:57:52.000000000 -0400 +++ /home/fbriere/fbuild/root/src/zaurus/InfoNES_System_Zaurus.cpp 2004-08-22 21:29:54.000000000 -0400 @@ -219,6 +219,7 @@ // The preparation of the SRAM file name strcpy( szSaveName, szRomName ); + // This will segfault if szRomName doesn't have a "." in it --fbriere strcpy( strrchr( szSaveName, '.' ) + 1, "srm" ); /*-------------------------------------------------------------------*/ diff -ru src/zaurus/Makefile /home/fbriere/fbuild/root/src/zaurus/Makefile --- src/zaurus/Makefile 2004-07-31 21:18:08.000000000 -0400 +++ /home/fbriere/fbuild/root/src/zaurus/Makefile 2004-08-22 22:16:01.000000000 -0400 @@ -9,14 +9,14 @@ CC = arm-linux-gcc CXX = arm-linux-g++ -CFLAGS = -pipe -W -O6 -DNO_DEBUG -CXXFLAGS= -pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -W -O6 -DNO_DEBUG -INCPATH = -I$(QPEDIR)/include -I$(QTDIR)/include +CFLAGS = -pipe -W -O2 -DSL5500 +CXXFLAGS= -pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -W -O2 -DSL5500 +INCPATH = -I/usr/arm-linux/include/qte2 LINK = arm-linux-g++ LFLAGS = -LIBS = $(SUBLIBS) -L$(QTDIR)/lib -lzdtm -lsl -lqpe -pthread -lqte -MOC = $(QTDIR)/bin/moc -UIC = $(QTDIR)/bin/uic +LIBS = $(SUBLIBS) -lqpe -pthread -lqte +MOC = /usr/bin/moc +UIC = /usr/bin/uic TAR = tar -cf GZIP = gzip -9f @@ -106,80 +106,7 @@ ####### Compile InfoNES_System_Zaurus.o: InfoNES_System_Zaurus.cpp \ - /opt/Qtopia/sharp/include/qpe/qpeapplication.h \ - /opt/Qtopia/sharp/include/qapplication.h \ - /opt/Qtopia/sharp/include/qwidget.h \ - /opt/Qtopia/sharp/include/qwindowdefs.h \ - /opt/Qtopia/sharp/include/qobjectdefs.h \ - /opt/Qtopia/sharp/include/qglobal.h \ - /opt/Qtopia/sharp/include/qfeatures.h \ - /opt/Qtopia/sharp/include/qconfig.h \ - /opt/Qtopia/sharp/include/qstring.h \ - /opt/Qtopia/sharp/include/qcstring.h \ - /opt/Qtopia/sharp/include/qarray.h \ - /opt/Qtopia/sharp/include/qgarray.h \ - /opt/Qtopia/sharp/include/qshared.h \ - /opt/Qtopia/sharp/include/qnamespace.h \ - /opt/Qtopia/sharp/include/qobject.h \ - /opt/Qtopia/sharp/include/qevent.h \ - /opt/Qtopia/sharp/include/qregion.h \ - /opt/Qtopia/sharp/include/qrect.h \ - /opt/Qtopia/sharp/include/qsize.h \ - /opt/Qtopia/sharp/include/qpoint.h \ - /opt/Qtopia/sharp/include/qmime.h \ - /opt/Qtopia/sharp/include/qlist.h \ - /opt/Qtopia/sharp/include/qglist.h \ - /opt/Qtopia/sharp/include/qcollection.h \ - /opt/Qtopia/sharp/include/qstringlist.h \ - /opt/Qtopia/sharp/include/qvaluelist.h \ - /opt/Qtopia/sharp/include/qdatastream.h \ - /opt/Qtopia/sharp/include/qiodevice.h \ - /opt/Qtopia/sharp/include/qregexp.h \ - /opt/Qtopia/sharp/include/qpaintdevice.h \ - /opt/Qtopia/sharp/include/qpalette.h \ - /opt/Qtopia/sharp/include/qcolor.h \ - /opt/Qtopia/sharp/include/qbrush.h \ - /opt/Qtopia/sharp/include/qcursor.h \ - /opt/Qtopia/sharp/include/qfont.h \ - /opt/Qtopia/sharp/include/qfontmetrics.h \ - /opt/Qtopia/sharp/include/qfontinfo.h \ - /opt/Qtopia/sharp/include/qstyle.h \ - /opt/Qtopia/sharp/include/qsizepolicy.h \ - /opt/Qtopia/sharp/include/qasciidict.h \ - /opt/Qtopia/sharp/include/qgdict.h \ - /opt/Qtopia/sharp/include/qtranslator.h \ - /opt/Qtopia/sharp/include/qintdict.h \ zinfones.h \ - /opt/Qtopia/sharp/include/qframe.h \ - /opt/Qtopia/sharp/include/qdirectpainter_qws.h \ - /opt/Qtopia/sharp/include/qpainter.h \ - /opt/Qtopia/sharp/include/qpen.h \ - /opt/Qtopia/sharp/include/qpointarray.h \ - /opt/Qtopia/sharp/include/qwmatrix.h \ - /opt/Qtopia/sharp/include/qdrawutil.h \ - /opt/Qtopia/sharp/include/qcheckbox.h \ - /opt/Qtopia/sharp/include/qbutton.h \ - /opt/Qtopia/sharp/include/qfiledialog.h \ - /opt/Qtopia/sharp/include/qdir.h \ - /opt/Qtopia/sharp/include/qstrlist.h \ - /opt/Qtopia/sharp/include/qfileinfo.h \ - /opt/Qtopia/sharp/include/qfile.h \ - /opt/Qtopia/sharp/include/qdatetime.h \ - /opt/Qtopia/sharp/include/qdialog.h \ - /opt/Qtopia/sharp/include/qlistbox.h \ - /opt/Qtopia/sharp/include/qscrollview.h \ - /opt/Qtopia/sharp/include/qscrollbar.h \ - /opt/Qtopia/sharp/include/qrangecontrol.h \ - /opt/Qtopia/sharp/include/qpixmap.h \ - /opt/Qtopia/sharp/include/qtimer.h \ - /opt/Qtopia/sharp/include/qlineedit.h \ - /opt/Qtopia/sharp/include/qlistview.h \ - /opt/Qtopia/sharp/include/qurloperator.h \ - /opt/Qtopia/sharp/include/qurl.h \ - /opt/Qtopia/sharp/include/qnetworkprotocol.h \ - /opt/Qtopia/sharp/include/qurlinfo.h \ - /opt/Qtopia/sharp/include/qdict.h \ - /opt/Qtopia/sharp/include/qqueue.h \ ../InfoNES.h \ ../InfoNES_System.h \ ../InfoNES_pAPU.h @@ -344,185 +271,21 @@ ../mapper/InfoNES_Mapper_252.cpp \ ../mapper/InfoNES_Mapper_255.cpp -../InfoNES_pApu.o: ../InfoNES_pApu.cpp \ +../InfoNES_pApu.o: ../InfoNES_pAPU.cpp \ ../K6502.h \ ../K6502_rw.h \ ../InfoNES.h \ ../InfoNES_Types.h \ ../InfoNES_System.h \ ../InfoNES_pAPU.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../InfoNES_pApu.o ../InfoNES_pAPU.cpp zinfones.o: zinfones.cpp \ zinfones.h \ - /opt/Qtopia/sharp/include/qapplication.h \ - /opt/Qtopia/sharp/include/qwidget.h \ - /opt/Qtopia/sharp/include/qwindowdefs.h \ - /opt/Qtopia/sharp/include/qobjectdefs.h \ - /opt/Qtopia/sharp/include/qglobal.h \ - /opt/Qtopia/sharp/include/qfeatures.h \ - /opt/Qtopia/sharp/include/qconfig.h \ - /opt/Qtopia/sharp/include/qstring.h \ - /opt/Qtopia/sharp/include/qcstring.h \ - /opt/Qtopia/sharp/include/qarray.h \ - /opt/Qtopia/sharp/include/qgarray.h \ - /opt/Qtopia/sharp/include/qshared.h \ - /opt/Qtopia/sharp/include/qnamespace.h \ - /opt/Qtopia/sharp/include/qobject.h \ - /opt/Qtopia/sharp/include/qevent.h \ - /opt/Qtopia/sharp/include/qregion.h \ - /opt/Qtopia/sharp/include/qrect.h \ - /opt/Qtopia/sharp/include/qsize.h \ - /opt/Qtopia/sharp/include/qpoint.h \ - /opt/Qtopia/sharp/include/qmime.h \ - /opt/Qtopia/sharp/include/qlist.h \ - /opt/Qtopia/sharp/include/qglist.h \ - /opt/Qtopia/sharp/include/qcollection.h \ - /opt/Qtopia/sharp/include/qstringlist.h \ - /opt/Qtopia/sharp/include/qvaluelist.h \ - /opt/Qtopia/sharp/include/qdatastream.h \ - /opt/Qtopia/sharp/include/qiodevice.h \ - /opt/Qtopia/sharp/include/qregexp.h \ - /opt/Qtopia/sharp/include/qpaintdevice.h \ - /opt/Qtopia/sharp/include/qpalette.h \ - /opt/Qtopia/sharp/include/qcolor.h \ - /opt/Qtopia/sharp/include/qbrush.h \ - /opt/Qtopia/sharp/include/qcursor.h \ - /opt/Qtopia/sharp/include/qfont.h \ - /opt/Qtopia/sharp/include/qfontmetrics.h \ - /opt/Qtopia/sharp/include/qfontinfo.h \ - /opt/Qtopia/sharp/include/qstyle.h \ - /opt/Qtopia/sharp/include/qsizepolicy.h \ - /opt/Qtopia/sharp/include/qasciidict.h \ - /opt/Qtopia/sharp/include/qgdict.h \ - /opt/Qtopia/sharp/include/qtranslator.h \ - /opt/Qtopia/sharp/include/qintdict.h \ - /opt/Qtopia/sharp/include/qframe.h \ - /opt/Qtopia/sharp/include/qdirectpainter_qws.h \ - /opt/Qtopia/sharp/include/qpainter.h \ - /opt/Qtopia/sharp/include/qpen.h \ - /opt/Qtopia/sharp/include/qpointarray.h \ - /opt/Qtopia/sharp/include/qwmatrix.h \ - /opt/Qtopia/sharp/include/qdrawutil.h \ - /opt/Qtopia/sharp/include/qcheckbox.h \ - /opt/Qtopia/sharp/include/qbutton.h \ - /opt/Qtopia/sharp/include/qfiledialog.h \ - /opt/Qtopia/sharp/include/qdir.h \ - /opt/Qtopia/sharp/include/qstrlist.h \ - /opt/Qtopia/sharp/include/qfileinfo.h \ - /opt/Qtopia/sharp/include/qfile.h \ - /opt/Qtopia/sharp/include/qdatetime.h \ - /opt/Qtopia/sharp/include/qdialog.h \ - /opt/Qtopia/sharp/include/qlistbox.h \ - /opt/Qtopia/sharp/include/qscrollview.h \ - /opt/Qtopia/sharp/include/qscrollbar.h \ - /opt/Qtopia/sharp/include/qrangecontrol.h \ - /opt/Qtopia/sharp/include/qpixmap.h \ - /opt/Qtopia/sharp/include/qtimer.h \ - /opt/Qtopia/sharp/include/qlineedit.h \ - /opt/Qtopia/sharp/include/qlistview.h \ - /opt/Qtopia/sharp/include/qurloperator.h \ - /opt/Qtopia/sharp/include/qurl.h \ - /opt/Qtopia/sharp/include/qnetworkprotocol.h \ - /opt/Qtopia/sharp/include/qurlinfo.h \ - /opt/Qtopia/sharp/include/qdict.h \ - /opt/Qtopia/sharp/include/qqueue.h \ ../InfoNES.h \ ../InfoNES_Types.h -zfileselector.o: zfileselector.cpp \ - /opt/Qtopia/sharp/include/qfile.h \ - /opt/Qtopia/sharp/include/qiodevice.h \ - /opt/Qtopia/sharp/include/qglobal.h \ - /opt/Qtopia/sharp/include/qfeatures.h \ - /opt/Qtopia/sharp/include/qconfig.h \ - /opt/Qtopia/sharp/include/qcstring.h \ - /opt/Qtopia/sharp/include/qarray.h \ - /opt/Qtopia/sharp/include/qgarray.h \ - /opt/Qtopia/sharp/include/qshared.h \ - /opt/Qtopia/sharp/include/qstring.h \ - /opt/Qtopia/sharp/include/qpushbutton.h \ - /opt/Qtopia/sharp/include/qbutton.h \ - /opt/Qtopia/sharp/include/qwidget.h \ - /opt/Qtopia/sharp/include/qwindowdefs.h \ - /opt/Qtopia/sharp/include/qobjectdefs.h \ - /opt/Qtopia/sharp/include/qnamespace.h \ - /opt/Qtopia/sharp/include/qobject.h \ - /opt/Qtopia/sharp/include/qevent.h \ - /opt/Qtopia/sharp/include/qregion.h \ - /opt/Qtopia/sharp/include/qrect.h \ - /opt/Qtopia/sharp/include/qsize.h \ - /opt/Qtopia/sharp/include/qpoint.h \ - /opt/Qtopia/sharp/include/qmime.h \ - /opt/Qtopia/sharp/include/qlist.h \ - /opt/Qtopia/sharp/include/qglist.h \ - /opt/Qtopia/sharp/include/qcollection.h \ - /opt/Qtopia/sharp/include/qstringlist.h \ - /opt/Qtopia/sharp/include/qvaluelist.h \ - /opt/Qtopia/sharp/include/qdatastream.h \ - /opt/Qtopia/sharp/include/qregexp.h \ - /opt/Qtopia/sharp/include/qpaintdevice.h \ - /opt/Qtopia/sharp/include/qpalette.h \ - /opt/Qtopia/sharp/include/qcolor.h \ - /opt/Qtopia/sharp/include/qbrush.h \ - /opt/Qtopia/sharp/include/qcursor.h \ - /opt/Qtopia/sharp/include/qfont.h \ - /opt/Qtopia/sharp/include/qfontmetrics.h \ - /opt/Qtopia/sharp/include/qfontinfo.h \ - /opt/Qtopia/sharp/include/qstyle.h \ - /opt/Qtopia/sharp/include/qsizepolicy.h \ - /opt/Qtopia/sharp/include/qiconset.h \ - /opt/Qtopia/sharp/include/qpixmap.h \ - /opt/Qtopia/sharp/include/qlayout.h \ - /opt/Qtopia/sharp/include/qabstractlayout.h \ - /opt/Qtopia/sharp/include/qvariant.h \ - /opt/Qtopia/sharp/include/qmap.h \ - /opt/Qtopia/sharp/include/qwhatsthis.h \ - /opt/Qtopia/sharp/include/qlineedit.h \ - /opt/Qtopia/sharp/include/qcheckbox.h \ - /opt/Qtopia/sharp/include/qlabel.h \ - /opt/Qtopia/sharp/include/qframe.h \ - /opt/Qtopia/sharp/include/qspinbox.h \ - /opt/Qtopia/sharp/include/qrangecontrol.h \ - /opt/Qtopia/sharp/include/qgroupbox.h \ - /opt/Qtopia/sharp/include/qpe/config.h \ - /opt/Qtopia/sharp/include/qpe/qpeapplication.h \ - /opt/Qtopia/sharp/include/qapplication.h \ - /opt/Qtopia/sharp/include/qasciidict.h \ - /opt/Qtopia/sharp/include/qgdict.h \ - /opt/Qtopia/sharp/include/qtranslator.h \ - /opt/Qtopia/sharp/include/qintdict.h \ - /opt/Qtopia/sharp/include/sl/slfileselector.h \ - /opt/Qtopia/sharp/include/qhbox.h \ - /opt/Qtopia/sharp/include/qvbox.h \ - /opt/Qtopia/sharp/include/qlistview.h \ - /opt/Qtopia/sharp/include/qscrollview.h \ - /opt/Qtopia/sharp/include/qscrollbar.h \ - /opt/Qtopia/sharp/include/qdrawutil.h \ - /opt/Qtopia/sharp/include/qpainter.h \ - /opt/Qtopia/sharp/include/qpen.h \ - /opt/Qtopia/sharp/include/qpointarray.h \ - /opt/Qtopia/sharp/include/qwmatrix.h \ - /opt/Qtopia/sharp/include/qiconview.h \ - /opt/Qtopia/sharp/include/qdragobject.h \ - /opt/Qtopia/sharp/include/qimage.h \ - /opt/Qtopia/sharp/include/qstrlist.h \ - /opt/Qtopia/sharp/include/qbitmap.h \ - /opt/Qtopia/sharp/include/qmodules.h \ - /opt/Qtopia/sharp/include/qtoolbutton.h \ - /opt/Qtopia/sharp/include/qfileinfo.h \ - /opt/Qtopia/sharp/include/qdatetime.h \ - /opt/Qtopia/sharp/include/qtableview.h \ - /opt/Qtopia/sharp/include/qwidgetstack.h \ - /opt/Qtopia/sharp/include/qptrdict.h \ - /opt/Qtopia/sharp/include/qpe/applnk.h \ - /opt/Qtopia/sharp/include/qdict.h \ - /opt/Qtopia/sharp/include/qpe/mimetype.h \ - /opt/Qtopia/sharp/include/sl/slmisc.h \ - /opt/Qtopia/sharp/include/qpe/global.h \ - /opt/Qtopia/sharp/include/qguardedptr.h \ - /opt/Qtopia/sharp/include/qmessagebox.h \ - /opt/Qtopia/sharp/include/qdialog.h \ - /opt/Qtopia/sharp/include/qtextcodec.h +zfileselector.o: zfileselector.cpp moc_zfileselector.o: moc_zfileselector.cpp \ zfileselector.h diff -ru src/zaurus/zfileselector.cpp /home/fbriere/fbuild/root/src/zaurus/zfileselector.cpp --- src/zaurus/zfileselector.cpp 2004-07-25 14:36:18.000000000 -0400 +++ /home/fbriere/fbuild/root/src/zaurus/zfileselector.cpp 2004-08-22 18:33:53.000000000 -0400 @@ -22,7 +22,6 @@ #include #include #include -#include /*-------------------------------------------------------------------*/ /* Constructor */ @@ -48,9 +47,9 @@ bl->setSpacing( 6 ); bl->setMargin( 11 ); - sfs = new SlFileSelector( dir, "*/*", this, "sfs" ); - sfs->setFocusMode( SlFileSelector::ByTab ); - bl->addWidget( sfs ); + // sfs = new SlFileSelector( dir, "*/*", this, "sfs" ); + // sfs->setFocusMode( SlFileSelector::ByTab ); + // bl->addWidget( sfs ); showMaximized(); } @@ -69,7 +68,7 @@ void zfileselector::accept() { - m_sFile = sfs->currentFile(); + // m_sFile = sfs->currentFile(); emit done( Accepted ); } diff -ru src/zaurus/zfileselector.h /home/fbriere/fbuild/root/src/zaurus/zfileselector.h --- src/zaurus/zfileselector.h 2004-07-25 14:36:08.000000000 -0400 +++ /home/fbriere/fbuild/root/src/zaurus/zfileselector.h 2004-08-22 18:55:10.000000000 -0400 @@ -33,7 +33,7 @@ private: QVBoxLayout * bl; - SlFileSelector * sfs; + //SlFileSelector * sfs; QString m_sFile; protected: diff -ru src/zaurus/zinfones.cpp /home/fbriere/fbuild/root/src/zaurus/zinfones.cpp --- src/zaurus/zinfones.cpp 2004-08-01 07:50:22.000000000 -0400 +++ /home/fbriere/fbuild/root/src/zaurus/zinfones.cpp 2004-08-22 21:29:37.000000000 -0400 @@ -29,6 +29,8 @@ setGeometry(320 - ( NES_DISP_WIDTH * 3 / 4 ), \ 240 - ( NES_DISP_HEIGHT * 3 / 4 ), \ NES_DISP_WIDTH * 3 / 2, NES_DISP_HEIGHT * 3 / 2); +#elif defined SL5500 + setGeometry(0, 42, NES_DISP_HEIGHT, NES_DISP_WIDTH); #else setGeometry(320 - ( NES_DISP_WIDTH / 2 ), \ 240 - ( NES_DISP_HEIGHT / 2 ), \ @@ -46,6 +48,8 @@ setGeometry(320 - ( NES_DISP_WIDTH * 3 / 4 ), \ 240 - ( NES_DISP_HEIGHT * 3 / 4 ), \ NES_DISP_WIDTH * 3 / 2, NES_DISP_HEIGHT * 3 / 2); +#elif defined SL5500 + setGeometry(0, 42, NES_DISP_HEIGHT, NES_DISP_WIDTH); #else setGeometry(320 - ( NES_DISP_WIDTH / 2 ), \ 240 - ( NES_DISP_HEIGHT / 2 ), \ @@ -76,6 +80,8 @@ if (y&1) pFb[ p- 1 ] = wColor; if (x&1) pFb[ p+480 ] = wColor; if ((x&1)&&(y&1)) pFb[ p+479 ] = wColor; +#elif defined SL5500 + pFb[ y * 320 + x + 21 ] = wColor; #else /* 1 magnification */ pFb[ (x + dx) * 480 - (y + dy) ] = wColor;