You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(35) |
Dec
(2) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(37) |
Feb
(10) |
Mar
|
Apr
(2) |
May
(17) |
Jun
(1) |
Jul
(14) |
Aug
(14) |
Sep
(4) |
Oct
|
Nov
(14) |
Dec
(4) |
2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
(92) |
Dec
(12) |
2006 |
Jan
(3) |
Feb
(4) |
Mar
|
Apr
(5) |
May
(3) |
Jun
(15) |
Jul
(3) |
Aug
(1) |
Sep
(29) |
Oct
(1) |
Nov
(6) |
Dec
(5) |
2007 |
Jan
(2) |
Feb
(2) |
Mar
|
Apr
(3) |
May
(14) |
Jun
(2) |
Jul
(16) |
Aug
(73) |
Sep
(12) |
Oct
(9) |
Nov
(27) |
Dec
(3) |
2008 |
Jan
(4) |
Feb
(4) |
Mar
(3) |
Apr
(8) |
May
(23) |
Jun
(4) |
Jul
(1) |
Aug
(3) |
Sep
(7) |
Oct
(5) |
Nov
(1) |
Dec
(1) |
2009 |
Jan
|
Feb
(10) |
Mar
|
Apr
(4) |
May
(4) |
Jun
(10) |
Jul
|
Aug
(1) |
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
(6) |
May
|
Jun
(3) |
Jul
(11) |
Aug
(1) |
Sep
|
Oct
(15) |
Nov
(1) |
Dec
(5) |
2011 |
Jan
(4) |
Feb
(1) |
Mar
(6) |
Apr
|
May
(22) |
Jun
|
Jul
(8) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
2012 |
Jan
|
Feb
(10) |
Mar
(1) |
Apr
(6) |
May
(27) |
Jun
(48) |
Jul
(30) |
Aug
(4) |
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(11) |
2013 |
Jan
(4) |
Feb
(7) |
Mar
(6) |
Apr
(18) |
May
(28) |
Jun
(20) |
Jul
|
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(7) |
2014 |
Jan
(3) |
Feb
(2) |
Mar
(4) |
Apr
(9) |
May
(11) |
Jun
(10) |
Jul
|
Aug
(18) |
Sep
(12) |
Oct
(17) |
Nov
(10) |
Dec
(16) |
2015 |
Jan
(5) |
Feb
(1) |
Mar
(5) |
Apr
(4) |
May
(28) |
Jun
(2) |
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
(2) |
Dec
(1) |
2016 |
Jan
(14) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(1) |
2017 |
Jan
(11) |
Feb
|
Mar
(21) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(2) |
Sep
(4) |
Oct
(4) |
Nov
|
Dec
(1) |
2019 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
(4) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
(10) |
Feb
(9) |
Mar
(5) |
Apr
(4) |
May
(3) |
Jun
(18) |
Jul
(4) |
Aug
(2) |
Sep
(20) |
Oct
(2) |
Nov
|
Dec
|
2021 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
2022 |
Jan
(1) |
Feb
(2) |
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
2023 |
Jan
(10) |
Feb
(7) |
Mar
(29) |
Apr
(31) |
May
(29) |
Jun
(34) |
Jul
(3) |
Aug
(24) |
Sep
(22) |
Oct
(10) |
Nov
(38) |
Dec
(27) |
2024 |
Jan
(15) |
Feb
(8) |
Mar
(4) |
Apr
(20) |
May
(33) |
Jun
(18) |
Jul
(15) |
Aug
(23) |
Sep
(26) |
Oct
(32) |
Nov
(6) |
Dec
(4) |
2025 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
(4) |
May
(46) |
Jun
(19) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <los...@us...> - 2008-10-22 07:25:48
|
Revision: 616 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=616&view=rev Author: lostgeneration Date: 2008-10-22 07:25:38 +0000 (Wed, 22 Oct 2008) Log Message: ----------- Removing all the old CVSID stuff from the kos-ports tree. I think this is the rest of them for kos-ports. Modified Paths: -------------- kos-ports/SDL/Makefile kos-ports/SDL/base/src/SDL.c kos-ports/SDL/base/src/SDL_error.c kos-ports/SDL/base/src/SDL_error_c.h kos-ports/SDL/base/src/SDL_fatal.c kos-ports/SDL/base/src/SDL_fatal.h kos-ports/SDL/base/src/SDL_getenv.c kos-ports/SDL/base/src/SDL_loadso.c kos-ports/SDL/base/src/SDL_loadso.h kos-ports/SDL/base/src/audio/SDL_audio.c kos-ports/SDL/base/src/audio/SDL_audio_c.h kos-ports/SDL/base/src/audio/SDL_audiocvt.c kos-ports/SDL/base/src/audio/SDL_audiodev.c kos-ports/SDL/base/src/audio/SDL_audiodev_c.h kos-ports/SDL/base/src/audio/SDL_audiomem.c kos-ports/SDL/base/src/audio/SDL_audiomem.h kos-ports/SDL/base/src/audio/SDL_mixer.c kos-ports/SDL/base/src/audio/SDL_sysaudio.h kos-ports/SDL/base/src/audio/SDL_wave.c kos-ports/SDL/base/src/audio/SDL_wave.h kos-ports/SDL/base/src/audio/dc/SDL_dcaudio.c kos-ports/SDL/base/src/audio/dc/SDL_dcaudio.h kos-ports/SDL/base/src/cdrom/SDL_cdrom.c kos-ports/SDL/base/src/cdrom/SDL_syscdrom.h kos-ports/SDL/base/src/cdrom/dc/SDL_syscdrom.c kos-ports/SDL/base/src/endian/SDL_endian.c kos-ports/SDL/base/src/events/SDL_active.c kos-ports/SDL/base/src/events/SDL_events.c kos-ports/SDL/base/src/events/SDL_events_c.h kos-ports/SDL/base/src/events/SDL_expose.c kos-ports/SDL/base/src/events/SDL_keyboard.c kos-ports/SDL/base/src/events/SDL_mouse.c kos-ports/SDL/base/src/events/SDL_quit.c kos-ports/SDL/base/src/events/SDL_resize.c kos-ports/SDL/base/src/events/SDL_sysevents.h kos-ports/SDL/base/src/file/SDL_rwops.c kos-ports/SDL/base/src/joystick/SDL_joystick.c kos-ports/SDL/base/src/joystick/SDL_joystick_c.h kos-ports/SDL/base/src/joystick/SDL_sysjoystick.h kos-ports/SDL/base/src/joystick/dc/SDL_sysjoystick.c kos-ports/SDL/base/src/thread/SDL_systhread.h kos-ports/SDL/base/src/thread/SDL_thread.c kos-ports/SDL/base/src/thread/SDL_thread_c.h kos-ports/SDL/base/src/thread/dc/SDL_syscond.c kos-ports/SDL/base/src/thread/dc/SDL_syscond_c.h kos-ports/SDL/base/src/thread/dc/SDL_sysmutex.c kos-ports/SDL/base/src/thread/dc/SDL_sysmutex_c.h kos-ports/SDL/base/src/thread/dc/SDL_syssem.c kos-ports/SDL/base/src/thread/dc/SDL_syssem_c.h kos-ports/SDL/base/src/thread/dc/SDL_systhread.c kos-ports/SDL/base/src/timer/SDL_systimer.h kos-ports/SDL/base/src/timer/SDL_timer.c kos-ports/SDL/base/src/timer/SDL_timer_c.h kos-ports/SDL/base/src/timer/dc/SDL_systimer.c kos-ports/SDL/base/src/video/SDL_RLEaccel.c kos-ports/SDL/base/src/video/SDL_RLEaccel_c.h kos-ports/SDL/base/src/video/SDL_blit.c kos-ports/SDL/base/src/video/SDL_blit.h kos-ports/SDL/base/src/video/SDL_blit_0.c kos-ports/SDL/base/src/video/SDL_blit_1.c kos-ports/SDL/base/src/video/SDL_blit_A.c kos-ports/SDL/base/src/video/SDL_blit_N.c kos-ports/SDL/base/src/video/SDL_bmp.c kos-ports/SDL/base/src/video/SDL_cursor.c kos-ports/SDL/base/src/video/SDL_cursor_c.h kos-ports/SDL/base/src/video/SDL_gamma.c kos-ports/SDL/base/src/video/SDL_leaks.h kos-ports/SDL/base/src/video/SDL_memops.h kos-ports/SDL/base/src/video/SDL_pixels.c kos-ports/SDL/base/src/video/SDL_pixels_c.h kos-ports/SDL/base/src/video/SDL_stretch.c kos-ports/SDL/base/src/video/SDL_stretch_c.h kos-ports/SDL/base/src/video/SDL_surface.c kos-ports/SDL/base/src/video/SDL_sysvideo.h kos-ports/SDL/base/src/video/SDL_video.c kos-ports/SDL/base/src/video/SDL_yuv.c kos-ports/SDL/base/src/video/SDL_yuv_sw.c kos-ports/SDL/base/src/video/SDL_yuv_sw_c.h kos-ports/SDL/base/src/video/SDL_yuvfuncs.h kos-ports/SDL/base/src/video/blank_cursor.h kos-ports/SDL/base/src/video/dc/SDL_dcevents.c kos-ports/SDL/base/src/video/dc/SDL_dcevents_c.h kos-ports/SDL/base/src/video/dc/SDL_dcmouse.c kos-ports/SDL/base/src/video/dc/SDL_dcmouse_c.h kos-ports/SDL/base/src/video/dc/SDL_dcvideo.c kos-ports/SDL/base/src/video/dc/SDL_dcvideo.h kos-ports/SDL/base/src/video/default_cursor.h kos-ports/include/SDL/SDL.h kos-ports/include/SDL/SDL_active.h kos-ports/include/SDL/SDL_audio.h kos-ports/include/SDL/SDL_byteorder.h kos-ports/include/SDL/SDL_cdrom.h kos-ports/include/SDL/SDL_copying.h kos-ports/include/SDL/SDL_endian.h kos-ports/include/SDL/SDL_error.h kos-ports/include/SDL/SDL_events.h kos-ports/include/SDL/SDL_joystick.h kos-ports/include/SDL/SDL_keyboard.h kos-ports/include/SDL/SDL_keysym.h kos-ports/include/SDL/SDL_main.h kos-ports/include/SDL/SDL_mouse.h kos-ports/include/SDL/SDL_mutex.h kos-ports/include/SDL/SDL_opengl.h kos-ports/include/SDL/SDL_quit.h kos-ports/include/SDL/SDL_rwops.h kos-ports/include/SDL/SDL_syswm.h kos-ports/include/SDL/SDL_thread.h kos-ports/include/SDL/SDL_timer.h kos-ports/include/SDL/SDL_types.h kos-ports/include/SDL/SDL_version.h kos-ports/include/SDL/SDL_video.h kos-ports/include/conio/conio.h kos-ports/include/conio/draw.h kos-ports/include/conio/input.h kos-ports/include/dcplib/fnt.h kos-ports/include/dcplib/sg.h kos-ports/include/dcplib/ul.h kos-ports/include/jpeg/jpeg.h kos-ports/include/kmg/kmg.h kos-ports/include/kosh/kosh.h kos-ports/include/lua/lua.h kos-ports/include/mp3/sfxmgr.h kos-ports/include/mp3/sndmp3.h kos-ports/include/mp3/sndserver.h kos-ports/include/ogg/ogg.h kos-ports/include/ogg/os_types.h kos-ports/include/oggvorbis/sndoggvorbis.h kos-ports/include/pcx/pcx.h kos-ports/include/png/png.h kos-ports/include/tga/tga.h kos-ports/include/vorbis/codec.h kos-ports/include/vorbis/vorbisfile.h kos-ports/include/zlib/zconf.h kos-ports/libconio/Makefile kos-ports/libdcplib/fnt.cc kos-ports/libdcplib/fntLocal.h kos-ports/libdcplib/fntTXF.cc kos-ports/libdcplib/sg.cc kos-ports/libdcplib/sgIsect.cc kos-ports/libdcplib/sgd.cc kos-ports/libdcplib/ulError.cc kos-ports/libgl/Makefile kos-ports/libgl/glclip.h kos-ports/libgl/glinternal.h kos-ports/libgl/glmacros.h kos-ports/libjpeg/Makefile kos-ports/libkmg/Makefile kos-ports/libkosh/Makefile kos-ports/libmp3/Makefile kos-ports/libmp3/libmp3/Makefile kos-ports/libmp3/libmp3/sndmp3_mpglib.c kos-ports/libmp3/xingmp3/L3.h kos-ports/libmp3/xingmp3/cdct.c kos-ports/libmp3/xingmp3/csbt.c kos-ports/libmp3/xingmp3/csbtL3.c kos-ports/libmp3/xingmp3/csbtb.c kos-ports/libmp3/xingmp3/cup.c kos-ports/libmp3/xingmp3/cupL1.c kos-ports/libmp3/xingmp3/cupini.c kos-ports/libmp3/xingmp3/cupl3.c kos-ports/libmp3/xingmp3/cwin.c kos-ports/libmp3/xingmp3/cwinb.c kos-ports/libmp3/xingmp3/cwinm.c kos-ports/libmp3/xingmp3/dec8.c kos-ports/libmp3/xingmp3/htable.h kos-ports/libmp3/xingmp3/hwin.c kos-ports/libmp3/xingmp3/icdct.c kos-ports/libmp3/xingmp3/isbt.c kos-ports/libmp3/xingmp3/isbtb.c kos-ports/libmp3/xingmp3/itype.h kos-ports/libmp3/xingmp3/iup.c kos-ports/libmp3/xingmp3/iupL1.c kos-ports/libmp3/xingmp3/iupini.c kos-ports/libmp3/xingmp3/iwinQ.c kos-ports/libmp3/xingmp3/iwinbQ.c kos-ports/libmp3/xingmp3/iwinm.c kos-ports/libmp3/xingmp3/jdw.h kos-ports/libmp3/xingmp3/l3dq.c kos-ports/libmp3/xingmp3/l3init.c kos-ports/libmp3/xingmp3/mdct.c kos-ports/libmp3/xingmp3/mhead.c kos-ports/libmp3/xingmp3/mhead.h kos-ports/libmp3/xingmp3/msis.c kos-ports/libmp3/xingmp3/port.h kos-ports/libmp3/xingmp3/tableawd.h kos-ports/libmp3/xingmp3/uph.c kos-ports/libmp3/xingmp3/upsf.c kos-ports/libmp3/xingmp3/xinglmc.h kos-ports/liboggvorbis/liboggvorbis/libogg/include/ogg/ogg.h kos-ports/liboggvorbis/liboggvorbis/libogg/include/ogg/os_types.h kos-ports/liboggvorbis/liboggvorbis/libogg/src/bitwise.c kos-ports/liboggvorbis/liboggvorbis/libogg/src/framing.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/include/vorbis/codec.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/include/vorbis/vorbisenc.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/include/vorbis/vorbisfile.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/analysis.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/backends.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/barkmel.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/bitrate.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/bitrate.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/block.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/codebook.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/codebook.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/codec_internal.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/envelope.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/envelope.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/floor0.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/floor1.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/highlevel.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/info.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/lookup.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/lookup.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/lookup_data.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/lpc.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/lpc.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/lsp.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/lsp.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/mapping0.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/masking.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/mdct.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/mdct.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/misc.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/os.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/psy.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/psy.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/psytune.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/registry.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/registry.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/res0.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/scales.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/sharedbook.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/smallft.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/smallft.h kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/synthesis.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/vorbisenc.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/vorbisfile.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/window.c kos-ports/liboggvorbis/liboggvorbis/libvorbis/lib/window.h kos-ports/libparallax/Makefile kos-ports/libparallax/include/color.h kos-ports/libparallax/include/context.h kos-ports/libparallax/include/dr.h kos-ports/libparallax/include/font.h kos-ports/libparallax/include/list.h kos-ports/libparallax/include/matrix.h kos-ports/libparallax/include/prim.h kos-ports/libparallax/include/sprite.h kos-ports/libparallax/include/texture.h kos-ports/libpcx/Makefile kos-ports/libpng/readpng.c kos-ports/libpng/writepng.c kos-ports/libs3m/Makefile kos-ports/libtga/Makefile kos-ports/libtremor/Makefile kos-ports/libtremor/kos/Makefile kos-ports/libtremor/xiph/Makefile kos-ports/libtremor/xiph/mdct.c kos-ports/libtremor/xiph/synthesis.c kos-ports/libtsunami/Makefile kos-ports/libtsunami/include/animation.h kos-ports/libtsunami/include/anims/alphafader.h kos-ports/libtsunami/include/anims/expxymover.h kos-ports/libtsunami/include/anims/logxymover.h kos-ports/libtsunami/include/anims/tintfader.h kos-ports/libtsunami/include/color.h kos-ports/libtsunami/include/color3.h kos-ports/libtsunami/include/drawable.h kos-ports/libtsunami/include/drawables/banner.h kos-ports/libtsunami/include/drawables/label.h kos-ports/libtsunami/include/drawables/scene.h kos-ports/libtsunami/include/font.h kos-ports/libtsunami/include/list.h kos-ports/libtsunami/include/matrix.h kos-ports/libtsunami/include/matrixdouble.h kos-ports/libtsunami/include/refcnt.h kos-ports/libtsunami/include/sound.h kos-ports/libtsunami/include/texture.h kos-ports/libtsunami/include/trigger.h kos-ports/libtsunami/include/triggers/birth.h kos-ports/libtsunami/include/triggers/chainanim.h kos-ports/libtsunami/include/triggers/death.h kos-ports/libtsunami/include/triggers/oneshot.h kos-ports/libtsunami/include/vector.h kos-ports/libtsunami/include/vector3.h kos-ports/libtsunami/include/vectordouble.h kos-ports/lua/etc/luser_tests.h kos-ports/lua/include/lauxlib.h kos-ports/lua/include/lua.h kos-ports/lua/include/lualib.h kos-ports/lua/src/lapi.c kos-ports/lua/src/lapi.h kos-ports/lua/src/lcode.c kos-ports/lua/src/lcode.h kos-ports/lua/src/ldebug.c kos-ports/lua/src/ldebug.h kos-ports/lua/src/ldo.c kos-ports/lua/src/ldo.h kos-ports/lua/src/ldump.c kos-ports/lua/src/lfunc.c kos-ports/lua/src/lfunc.h kos-ports/lua/src/lgc.c kos-ports/lua/src/lgc.h kos-ports/lua/src/lib/lauxlib.c kos-ports/lua/src/lib/lbaselib.c kos-ports/lua/src/lib/ldblib.c kos-ports/lua/src/lib/liolib.c kos-ports/lua/src/lib/lmathlib.c kos-ports/lua/src/lib/loadlib.c kos-ports/lua/src/lib/lstrlib.c kos-ports/lua/src/lib/ltablib.c kos-ports/lua/src/llex.c kos-ports/lua/src/llex.h kos-ports/lua/src/llimits.h kos-ports/lua/src/lmem.c kos-ports/lua/src/lmem.h kos-ports/lua/src/lobject.c kos-ports/lua/src/lobject.h kos-ports/lua/src/lopcodes.c kos-ports/lua/src/lopcodes.h kos-ports/lua/src/lparser.c kos-ports/lua/src/lparser.h kos-ports/lua/src/lstate.c kos-ports/lua/src/lstate.h kos-ports/lua/src/lstring.c kos-ports/lua/src/lstring.h kos-ports/lua/src/ltable.c kos-ports/lua/src/ltable.h kos-ports/lua/src/ltests.c kos-ports/lua/src/ltm.c kos-ports/lua/src/ltm.h kos-ports/lua/src/lua/lua.c kos-ports/lua/src/luac/luac.c kos-ports/lua/src/luac/print.c kos-ports/lua/src/lundump.c kos-ports/lua/src/lundump.h kos-ports/lua/src/lvm.c kos-ports/lua/src/lvm.h kos-ports/lua/src/lzio.c kos-ports/lua/src/lzio.h kos-ports/lwip/Makefile kos-ports/lwip/kos/include/lwip/lwip.h kos-ports/lwip/kos/include/netif/kosnetif.h kos-ports/lwip/lwip/src/netif/ppp/chap.h kos-ports/lwip/lwip/src/netif/ppp/chpms.h kos-ports/lwip/lwip/src/netif/ppp/fsm.h kos-ports/lwip/lwip/src/netif/ppp/ipcp.h kos-ports/lwip/lwip/src/netif/ppp/lcp.h kos-ports/lwip/lwip/src/netif/ppp/magic.h kos-ports/lwip/lwip/src/netif/ppp/vj.h kos-ports/zlib/adler32.c kos-ports/zlib/compress.c kos-ports/zlib/crc32.c kos-ports/zlib/deflate.c kos-ports/zlib/deflate.h kos-ports/zlib/gzio.c kos-ports/zlib/trees.c kos-ports/zlib/uncompr.c kos-ports/zlib/zutil.c kos-ports/zlib/zutil.h Modified: kos-ports/SDL/Makefile =================================================================== --- kos-ports/SDL/Makefile 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/Makefile 2008-10-22 07:25:38 UTC (rev 616) @@ -2,8 +2,6 @@ # # addons/SDL/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/12/09 06:09:16 bardtx Exp $ all: $(KOS_MAKE) -C base Modified: kos-ports/SDL/base/src/SDL.c =================================================================== --- kos-ports/SDL/base/src/SDL.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/SDL.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Initialization code for SDL */ #include <stdlib.h> /* For getenv() */ Modified: kos-ports/SDL/base/src/SDL_error.c =================================================================== --- kos-ports/SDL/base/src/SDL_error.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/SDL_error.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_error.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Simple error handling in SDL */ #include <stdio.h> Modified: kos-ports/SDL/base/src/SDL_error_c.h =================================================================== --- kos-ports/SDL/base/src/SDL_error_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/SDL_error_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_error_c.h,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* This file defines a structure that carries language-independent error messages */ Modified: kos-ports/SDL/base/src/SDL_fatal.c =================================================================== --- kos-ports/SDL/base/src/SDL_fatal.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/SDL_fatal.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_fatal.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* General fatal signal handling code for SDL */ #ifdef NO_SIGNAL_H Modified: kos-ports/SDL/base/src/SDL_fatal.h =================================================================== --- kos-ports/SDL/base/src/SDL_fatal.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/SDL_fatal.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_fatal.h,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* General fatal signal handling code for SDL */ extern void SDL_InstallParachute(void); Modified: kos-ports/SDL/base/src/SDL_getenv.c =================================================================== --- kos-ports/SDL/base/src/SDL_getenv.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/SDL_getenv.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_getenv.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Not all environments have a working getenv()/putenv() */ #ifdef TEST_MAIN Modified: kos-ports/SDL/base/src/SDL_loadso.c =================================================================== --- kos-ports/SDL/base/src/SDL_loadso.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/SDL_loadso.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_loadso.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ Modified: kos-ports/SDL/base/src/SDL_loadso.h =================================================================== --- kos-ports/SDL/base/src/SDL_loadso.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/SDL_loadso.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_loadso.h,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ /* Note: This API isn't meant for public release until SDL 1.3 */ Modified: kos-ports/SDL/base/src/audio/SDL_audio.c =================================================================== --- kos-ports/SDL/base/src/audio/SDL_audio.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_audio.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_audio.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Allow access to a raw mixing buffer */ #include <stdlib.h> #include <stdio.h> Modified: kos-ports/SDL/base/src/audio/SDL_audio_c.h =================================================================== --- kos-ports/SDL/base/src/audio/SDL_audio_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_audio_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_audio_c.h,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Functions and variables exported from SDL_audio.c for SDL_sysaudio.c */ /* Functions to get a list of "close" audio formats */ Modified: kos-ports/SDL/base/src/audio/SDL_audiocvt.c =================================================================== --- kos-ports/SDL/base/src/audio/SDL_audiocvt.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_audiocvt.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_audiocvt.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Functions for audio drivers to perform runtime conversion of audio format */ #include <stdio.h> Modified: kos-ports/SDL/base/src/audio/SDL_audiodev.c =================================================================== --- kos-ports/SDL/base/src/audio/SDL_audiodev.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_audiodev.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_audiodev.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Get the name of the audio device we use for output */ #if defined(unix) || defined(__unix__) Modified: kos-ports/SDL/base/src/audio/SDL_audiodev_c.h =================================================================== --- kos-ports/SDL/base/src/audio/SDL_audiodev_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_audiodev_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_audiodev_c.h,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Open the audio device, storing the pathname in 'path' */ extern int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic); Modified: kos-ports/SDL/base/src/audio/SDL_audiomem.c =================================================================== --- kos-ports/SDL/base/src/audio/SDL_audiomem.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_audiomem.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_audiomem.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Functions to allocate audio buffer memory, shareable across threads (necessary because SDL audio emulates threads with fork() */ Modified: kos-ports/SDL/base/src/audio/SDL_audiomem.h =================================================================== --- kos-ports/SDL/base/src/audio/SDL_audiomem.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_audiomem.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_audiomem.h,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Functions to allocate audio buffer memory, shareable across threads (necessary because SDL audio emulates threads with fork() */ Modified: kos-ports/SDL/base/src/audio/SDL_mixer.c =================================================================== --- kos-ports/SDL/base/src/audio/SDL_mixer.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_mixer.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_mixer.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* This provides the default mixing callback for the SDL audio routines */ #include <stdio.h> Modified: kos-ports/SDL/base/src/audio/SDL_sysaudio.h =================================================================== --- kos-ports/SDL/base/src/audio/SDL_sysaudio.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_sysaudio.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_sysaudio.h,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - #ifndef _SDL_sysaudio_h #define _SDL_sysaudio_h Modified: kos-ports/SDL/base/src/audio/SDL_wave.c =================================================================== --- kos-ports/SDL/base/src/audio/SDL_wave.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_wave.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_wave.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - #ifndef DISABLE_FILE /* Microsoft WAVE file loading routines */ Modified: kos-ports/SDL/base/src/audio/SDL_wave.h =================================================================== --- kos-ports/SDL/base/src/audio/SDL_wave.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/SDL_wave.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_wave.h,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* WAVE files are little-endian */ /*******************************************/ Modified: kos-ports/SDL/base/src/audio/dc/SDL_dcaudio.c =================================================================== --- kos-ports/SDL/base/src/audio/dc/SDL_dcaudio.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/dc/SDL_dcaudio.c 2008-10-22 07:25:38 UTC (rev 616) @@ -22,11 +22,6 @@ Modified by Lawrence Sebald <blu...@ne...> */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_dcaudio.c,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - /* Output dreamcast aica */ #include <kos.h> #include <dc/g2bus.h> Modified: kos-ports/SDL/base/src/audio/dc/SDL_dcaudio.h =================================================================== --- kos-ports/SDL/base/src/audio/dc/SDL_dcaudio.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/audio/dc/SDL_dcaudio.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ based on SDL_diskaudio.h by Sam Lantinga <sl...@li...> */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_dcaudio.h,v 1.1 2002/12/09 05:30:22 bardtx Exp $"; -#endif - #ifndef _SDL_diskaudio_h #define _SDL_diskaudio_h Modified: kos-ports/SDL/base/src/cdrom/SDL_cdrom.c =================================================================== --- kos-ports/SDL/base/src/cdrom/SDL_cdrom.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/cdrom/SDL_cdrom.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_cdrom.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* This is the CD-audio control API for Simple DirectMedia Layer */ #include <stdio.h> Modified: kos-ports/SDL/base/src/cdrom/SDL_syscdrom.h =================================================================== --- kos-ports/SDL/base/src/cdrom/SDL_syscdrom.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/cdrom/SDL_syscdrom.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_syscdrom.h,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* This is the system specific header for the SDL CD-ROM API */ /* Structure of CD audio control functions */ Modified: kos-ports/SDL/base/src/cdrom/dc/SDL_syscdrom.c =================================================================== --- kos-ports/SDL/base/src/cdrom/dc/SDL_syscdrom.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/cdrom/dc/SDL_syscdrom.c 2008-10-22 07:25:38 UTC (rev 616) @@ -27,11 +27,6 @@ Modified by Lawrence Sebald <blu...@ne...> */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_syscdrom.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* Functions for system-level CD-ROM audio control */ #include <kos.h> Modified: kos-ports/SDL/base/src/endian/SDL_endian.c =================================================================== --- kos-ports/SDL/base/src/endian/SDL_endian.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/endian/SDL_endian.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_endian.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* Functions for dynamically reading and writing endian-specific values */ #include "SDL_endian.h" Modified: kos-ports/SDL/base/src/events/SDL_active.c =================================================================== --- kos-ports/SDL/base/src/events/SDL_active.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/events/SDL_active.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_active.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* Application focus/iconification handling code for SDL */ #include <stdio.h> Modified: kos-ports/SDL/base/src/events/SDL_events.c =================================================================== --- kos-ports/SDL/base/src/events/SDL_events.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/events/SDL_events.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_events.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* General event handling code for SDL */ #include <stdio.h> Modified: kos-ports/SDL/base/src/events/SDL_events_c.h =================================================================== --- kos-ports/SDL/base/src/events/SDL_events_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/events/SDL_events_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_events_c.h,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* Useful functions and variables from SDL_events.c */ #include "SDL_events.h" Modified: kos-ports/SDL/base/src/events/SDL_expose.c =================================================================== --- kos-ports/SDL/base/src/events/SDL_expose.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/events/SDL_expose.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_expose.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* Refresh event handling code for SDL */ #include "SDL_events.h" Modified: kos-ports/SDL/base/src/events/SDL_keyboard.c =================================================================== --- kos-ports/SDL/base/src/events/SDL_keyboard.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/events/SDL_keyboard.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_keyboard.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* General keyboard handling code for SDL */ #include <stdio.h> Modified: kos-ports/SDL/base/src/events/SDL_mouse.c =================================================================== --- kos-ports/SDL/base/src/events/SDL_mouse.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/events/SDL_mouse.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_mouse.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* General mouse handling code for SDL */ #include <stdio.h> Modified: kos-ports/SDL/base/src/events/SDL_quit.c =================================================================== --- kos-ports/SDL/base/src/events/SDL_quit.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/events/SDL_quit.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_quit.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* General quit handling code for SDL */ #include <stdio.h> Modified: kos-ports/SDL/base/src/events/SDL_resize.c =================================================================== --- kos-ports/SDL/base/src/events/SDL_resize.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/events/SDL_resize.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_resize.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* Resize event handling code for SDL */ #include "SDL_events.h" Modified: kos-ports/SDL/base/src/events/SDL_sysevents.h =================================================================== --- kos-ports/SDL/base/src/events/SDL_sysevents.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/events/SDL_sysevents.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_sysevents.h,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - #include "SDL_sysvideo.h" /* Useful functions and variables from SDL_sysevents.c */ Modified: kos-ports/SDL/base/src/file/SDL_rwops.c =================================================================== --- kos-ports/SDL/base/src/file/SDL_rwops.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/file/SDL_rwops.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_rwops.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* This file provides a general interface for SDL to read and write data sources. It can easily be extended to files, memory, etc. */ Modified: kos-ports/SDL/base/src/joystick/SDL_joystick.c =================================================================== --- kos-ports/SDL/base/src/joystick/SDL_joystick.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/joystick/SDL_joystick.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_joystick.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* This is the joystick API for Simple DirectMedia Layer */ #include <stdio.h> Modified: kos-ports/SDL/base/src/joystick/SDL_joystick_c.h =================================================================== --- kos-ports/SDL/base/src/joystick/SDL_joystick_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/joystick/SDL_joystick_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_joystick_c.h,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* Useful functions and variables from SDL_joystick.c */ #include "SDL_joystick.h" Modified: kos-ports/SDL/base/src/joystick/SDL_sysjoystick.h =================================================================== --- kos-ports/SDL/base/src/joystick/SDL_sysjoystick.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/joystick/SDL_sysjoystick.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_sysjoystick.h,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* This is the system specific header for the SDL joystick API */ #include "SDL_joystick.h" Modified: kos-ports/SDL/base/src/joystick/dc/SDL_sysjoystick.c =================================================================== --- kos-ports/SDL/base/src/joystick/dc/SDL_sysjoystick.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/joystick/dc/SDL_sysjoystick.c 2008-10-22 07:25:38 UTC (rev 616) @@ -25,11 +25,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_sysjoystick.c,v 1.1 2002/12/09 05:30:23 bardtx Exp $"; -#endif - /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */ #include <stdlib.h> Modified: kos-ports/SDL/base/src/thread/SDL_systhread.h =================================================================== --- kos-ports/SDL/base/src/thread/SDL_systhread.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/SDL_systhread.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_systhread.h,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - /* These are functions that need to be implemented by a port of SDL */ #include "SDL_thread_c.h" Modified: kos-ports/SDL/base/src/thread/SDL_thread.c =================================================================== --- kos-ports/SDL/base/src/thread/SDL_thread.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/SDL_thread.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_thread.c,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - /* System independent thread management routines for SDL */ #include <stdio.h> Modified: kos-ports/SDL/base/src/thread/SDL_thread_c.h =================================================================== --- kos-ports/SDL/base/src/thread/SDL_thread_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/SDL_thread_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_thread_c.h,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - #ifndef _SDL_thread_c_h #define _SDL_thread_c_h Modified: kos-ports/SDL/base/src/thread/dc/SDL_syscond.c =================================================================== --- kos-ports/SDL/base/src/thread/dc/SDL_syscond.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/dc/SDL_syscond.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_syscond.c,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - /* An implementation of condition variables using semaphores and mutexes */ /* This implementation borrows heavily from the BeOS condition variable Modified: kos-ports/SDL/base/src/thread/dc/SDL_syscond_c.h =================================================================== --- kos-ports/SDL/base/src/thread/dc/SDL_syscond_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/dc/SDL_syscond_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,8 +20,3 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_syscond_c.h,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - Modified: kos-ports/SDL/base/src/thread/dc/SDL_sysmutex.c =================================================================== --- kos-ports/SDL/base/src/thread/dc/SDL_sysmutex.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/dc/SDL_sysmutex.c 2008-10-22 07:25:38 UTC (rev 616) @@ -25,11 +25,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_sysmutex.c,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - /* An implementation of mutexes using semaphores */ #include <stdio.h> Modified: kos-ports/SDL/base/src/thread/dc/SDL_sysmutex_c.h =================================================================== --- kos-ports/SDL/base/src/thread/dc/SDL_sysmutex_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/dc/SDL_sysmutex_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,8 +20,3 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_sysmutex_c.h,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - Modified: kos-ports/SDL/base/src/thread/dc/SDL_syssem.c =================================================================== --- kos-ports/SDL/base/src/thread/dc/SDL_syssem.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/dc/SDL_syssem.c 2008-10-22 07:25:38 UTC (rev 616) @@ -25,11 +25,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_syssem.c,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - /* An implementation of semaphores using mutexes and condition variables */ #include <stdlib.h> Modified: kos-ports/SDL/base/src/thread/dc/SDL_syssem_c.h =================================================================== --- kos-ports/SDL/base/src/thread/dc/SDL_syssem_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/dc/SDL_syssem_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,8 +20,3 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_syssem_c.h,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - Modified: kos-ports/SDL/base/src/thread/dc/SDL_systhread.c =================================================================== --- kos-ports/SDL/base/src/thread/dc/SDL_systhread.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/thread/dc/SDL_systhread.c 2008-10-22 07:25:38 UTC (rev 616) @@ -25,11 +25,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_systhread.c,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - /* Thread management routines for SDL */ #include "SDL_error.h" Modified: kos-ports/SDL/base/src/timer/SDL_systimer.h =================================================================== --- kos-ports/SDL/base/src/timer/SDL_systimer.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/timer/SDL_systimer.h 2008-10-22 07:25:38 UTC (rev 616) @@ -22,11 +22,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_systimer.h,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - /* The system dependent timer handling functions */ #include "SDL_timer.h" Modified: kos-ports/SDL/base/src/timer/SDL_timer.c =================================================================== --- kos-ports/SDL/base/src/timer/SDL_timer.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/timer/SDL_timer.c 2008-10-22 07:25:38 UTC (rev 616) @@ -22,11 +22,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_timer.c,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - #include <stdlib.h> #include <stdio.h> /* For the definition of NULL */ Modified: kos-ports/SDL/base/src/timer/SDL_timer_c.h =================================================================== --- kos-ports/SDL/base/src/timer/SDL_timer_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/timer/SDL_timer_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -22,11 +22,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_timer_c.h,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - /* Useful functions and variables from SDL_timer.c */ #include "SDL_timer.h" Modified: kos-ports/SDL/base/src/timer/dc/SDL_systimer.c =================================================================== --- kos-ports/SDL/base/src/timer/dc/SDL_systimer.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/timer/dc/SDL_systimer.c 2008-10-22 07:25:38 UTC (rev 616) @@ -25,11 +25,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_systimer.c,v 1.1 2002/12/09 05:30:24 bardtx Exp $"; -#endif - #include <kos.h> #include "SDL_thread.h" Modified: kos-ports/SDL/base/src/video/SDL_RLEaccel.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_RLEaccel.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_RLEaccel.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_RLEaccel.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* * RLE encoding for software colorkey and alpha-channel acceleration * Modified: kos-ports/SDL/base/src/video/SDL_RLEaccel_c.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_RLEaccel_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_RLEaccel_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_RLEaccel_c.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* Useful functions and variables from SDL_RLEaccel.c */ extern int SDL_RLESurface(SDL_Surface *surface); Modified: kos-ports/SDL/base/src/video/SDL_blit.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_blit.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_blit.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_blit.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: kos-ports/SDL/base/src/video/SDL_blit.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_blit.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_blit.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_blit.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #ifndef _SDL_blit_h #define _SDL_blit_h Modified: kos-ports/SDL/base/src/video/SDL_blit_0.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_blit_0.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_blit_0.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_blit_0.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include <stdio.h> #include <string.h> Modified: kos-ports/SDL/base/src/video/SDL_blit_1.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_blit_1.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_blit_1.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_blit_1.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include <stdio.h> #include "SDL_types.h" Modified: kos-ports/SDL/base/src/video/SDL_blit_A.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_blit_A.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_blit_A.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_blit_A.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include <stdio.h> #include "SDL_types.h" Modified: kos-ports/SDL/base/src/video/SDL_blit_N.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_blit_N.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_blit_N.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_blit_N.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include <stdio.h> #include "SDL_types.h" Modified: kos-ports/SDL/base/src/video/SDL_bmp.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_bmp.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_bmp.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_bmp.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #ifndef DISABLE_FILE /* Modified: kos-ports/SDL/base/src/video/SDL_cursor.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_cursor.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_cursor.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_cursor.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* General cursor handling code for SDL */ #include <stdio.h> Modified: kos-ports/SDL/base/src/video/SDL_cursor_c.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_cursor_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_cursor_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_cursor_c.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* Useful variables and functions from SDL_cursor.c */ #include "SDL_mouse.h" Modified: kos-ports/SDL/base/src/video/SDL_gamma.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_gamma.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_gamma.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_gamma.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* Gamma correction support */ #define USE_MATH_H /* Used for calculating gamma ramps */ Modified: kos-ports/SDL/base/src/video/SDL_leaks.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_leaks.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_leaks.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_leaks.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* Define this if you want surface leak detection code enabled */ /*#define CHECK_LEAKS*/ Modified: kos-ports/SDL/base/src/video/SDL_memops.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_memops.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_memops.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_memops.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #ifndef _SDL_memops_h #define _SDL_memops_h Modified: kos-ports/SDL/base/src/video/SDL_pixels.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_pixels.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_pixels.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_pixels.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* General (mostly internal) pixel/color manipulation routines for SDL */ #include <stdio.h> Modified: kos-ports/SDL/base/src/video/SDL_pixels_c.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_pixels_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_pixels_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_pixels_c.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* Useful functions and variables from SDL_pixel.c */ #include "SDL_blit.h" Modified: kos-ports/SDL/base/src/video/SDL_stretch.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_stretch.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_stretch.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_stretch.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* This a stretch blit implementation based on ideas given to me by Tomasz Cejner - thanks! :) Modified: kos-ports/SDL/base/src/video/SDL_stretch_c.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_stretch_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_stretch_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_stretch_c.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* Perform a stretch blit between two surfaces of the same format. NOTE: This function is not safe to call from multiple threads! */ Modified: kos-ports/SDL/base/src/video/SDL_surface.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_surface.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_surface.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_surface.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: kos-ports/SDL/base/src/video/SDL_sysvideo.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_sysvideo.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_sysvideo.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_sysvideo.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #ifndef _SDL_sysvideo_h #define _SDL_sysvideo_h Modified: kos-ports/SDL/base/src/video/SDL_video.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_video.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_video.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_video.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* The high-level video driver subsystem */ #include <stdio.h> Modified: kos-ports/SDL/base/src/video/SDL_yuv.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_yuv.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_yuv.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_yuv.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* This is the implementation of the YUV video surface support */ #include <stdlib.h> Modified: kos-ports/SDL/base/src/video/SDL_yuv_sw.c =================================================================== --- kos-ports/SDL/base/src/video/SDL_yuv_sw.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_yuv_sw.c 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_yuv_sw.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* This is the software implementation of the YUV video overlay support */ /* This code was derived from code carrying the following copyright notices: Modified: kos-ports/SDL/base/src/video/SDL_yuv_sw_c.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_yuv_sw_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_yuv_sw_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_yuv_sw_c.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include "SDL_video.h" #include "SDL_sysvideo.h" Modified: kos-ports/SDL/base/src/video/SDL_yuvfuncs.h =================================================================== --- kos-ports/SDL/base/src/video/SDL_yuvfuncs.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/SDL_yuvfuncs.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_yuvfuncs.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* This is the definition of the YUV video surface function structure */ #include "SDL_video.h" Modified: kos-ports/SDL/base/src/video/blank_cursor.h =================================================================== --- kos-ports/SDL/base/src/video/blank_cursor.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/blank_cursor.h 2008-10-22 07:25:38 UTC (rev 616) @@ -20,11 +20,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: blank_cursor.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * A default blank 8x8 cursor */ Modified: kos-ports/SDL/base/src/video/dc/SDL_dcevents.c =================================================================== --- kos-ports/SDL/base/src/video/dc/SDL_dcevents.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/dc/SDL_dcevents.c 2008-10-22 07:25:38 UTC (rev 616) @@ -27,11 +27,6 @@ Modified by Lawrence Sebald <blu...@ne...> */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_dcevents.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - /* Being a null driver, there's no event stream. We just define stubs for most of the API. */ Modified: kos-ports/SDL/base/src/video/dc/SDL_dcevents_c.h =================================================================== --- kos-ports/SDL/base/src/video/dc/SDL_dcevents_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/dc/SDL_dcevents_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -25,11 +25,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_dcevents_c.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include "SDL_dcvideo.h" /* Variables and functions exported by SDL_sysevents.c to other parts Modified: kos-ports/SDL/base/src/video/dc/SDL_dcmouse.c =================================================================== --- kos-ports/SDL/base/src/video/dc/SDL_dcmouse.c 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/dc/SDL_dcmouse.c 2008-10-22 07:25:38 UTC (rev 616) @@ -25,11 +25,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_dcmouse.c,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include <stdio.h> #include "SDL_error.h" Modified: kos-ports/SDL/base/src/video/dc/SDL_dcmouse_c.h =================================================================== --- kos-ports/SDL/base/src/video/dc/SDL_dcmouse_c.h 2008-10-21 22:31:18 UTC (rev 615) +++ kos-ports/SDL/base/src/video/dc/SDL_dcmouse_c.h 2008-10-22 07:25:38 UTC (rev 616) @@ -25,11 +25,6 @@ sl...@li... */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_dcmouse_c.h,v 1.1 2002/12/09 05:30:25 bardtx Exp $"; -#endif - #include "SDL_dcvideo.h" /* Functions to be exported */ Modified: kos-ports/SDL/base/src/video/dc/SDL_dcvideo.c =================================... [truncated message content] |
From: <los...@us...> - 2008-10-21 22:31:28
|
Revision: 615 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=615&view=rev Author: lostgeneration Date: 2008-10-21 22:31:18 +0000 (Tue, 21 Oct 2008) Log Message: ----------- Removing all the old CVSID stuff from the kos-ports tree. Modified Paths: -------------- kos-ports/libconio/input.c kos-ports/libgl/glblend.c kos-ports/libgl/gldepth.c kos-ports/libgl/gldraw.c kos-ports/libgl/glfog.c kos-ports/libgl/glkos.c kos-ports/libgl/gllight.c kos-ports/libgl/glmisc.c kos-ports/libgl/glmodifier.c kos-ports/libgl/glnzclip.c kos-ports/libgl/gltex.c kos-ports/libgl/gltrans.c kos-ports/libkmg/kmg.c kos-ports/libmp3/libmp3/main.c kos-ports/libmp3/libmp3/sndmp3.c kos-ports/liboggvorbis/liboggvorbisplay/sndoggvorbis.c kos-ports/libparallax/src/context.c kos-ports/libparallax/src/font.c kos-ports/libparallax/src/mat3d.c kos-ports/libparallax/src/texture.c kos-ports/libpcx/pcx.c kos-ports/libpcx/pcx_texture.c kos-ports/libs3m/s3m.c kos-ports/libs3m/sfxmgr.c kos-ports/libtga/tga.c kos-ports/libtga/tga_texture.c kos-ports/libtremor/kos/sndoggvorbis.c kos-ports/libtsunami/doc/conventions.txt kos-ports/libtsunami/doc/readme.txt kos-ports/libtsunami/doc/specs.txt kos-ports/libtsunami/doc/status.txt kos-ports/libtsunami/src/animation.cpp kos-ports/libtsunami/src/anims/alphafader.cpp kos-ports/libtsunami/src/anims/expxymover.cpp kos-ports/libtsunami/src/anims/logxymover.cpp kos-ports/libtsunami/src/anims/tintfader.cpp kos-ports/libtsunami/src/drawable.cpp kos-ports/libtsunami/src/drawables/banner.cpp kos-ports/libtsunami/src/drawables/label.cpp kos-ports/libtsunami/src/font.cpp kos-ports/libtsunami/src/matrix.cpp kos-ports/libtsunami/src/matrixdouble.cpp kos-ports/libtsunami/src/sound.cpp kos-ports/libtsunami/src/texture.cpp kos-ports/libtsunami/src/trigger.cpp kos-ports/libtsunami/src/triggers/birth.cpp kos-ports/libtsunami/src/triggers/death.cpp Modified: kos-ports/libconio/input.c =================================================================== --- kos-ports/libconio/input.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libconio/input.c 2008-10-21 22:31:18 UTC (rev 615) @@ -17,8 +17,6 @@ #include <dc/maple/keyboard.h> #include <conio/conio.h> -CVSID("$Id: input.c,v 1.7 2003/07/15 07:36:16 bardtx Exp $"); - /* This module defines a conio input system, if you want to use it. */ /* the buffer for input */ Modified: kos-ports/libgl/glblend.c =================================================================== --- kos-ports/libgl/glblend.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/glblend.c 2008-10-21 22:31:18 UTC (rev 615) @@ -11,8 +11,6 @@ #include <assert.h> -CVSID("$Id: glblend.c,v 1.3 2002/04/03 03:33:38 axlen Exp $"); - /* Blending */ void glBlendFunc(GLenum sfactor, GLenum dfactor) { Modified: kos-ports/libgl/gldepth.c =================================================================== --- kos-ports/libgl/gldepth.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/gldepth.c 2008-10-21 22:31:18 UTC (rev 615) @@ -12,8 +12,6 @@ #include <assert.h> #include <stdio.h> -CVSID("$Id: gldepth.c,v 1.7 2002/04/03 03:34:22 axlen Exp $"); - /* Depth buffer (non-functional, just stubs) */ void glClearDepth(GLclampd depth) { assert_msg(!gl_prim_type, "Not allowed within glBegin/glEnd pair."); Modified: kos-ports/libgl/gldraw.c =================================================================== --- kos-ports/libgl/gldraw.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/gldraw.c 2008-10-21 22:31:18 UTC (rev 615) @@ -14,8 +14,6 @@ #include <malloc.h> #include <dc/pvr.h> -CVSID("$Id: gldraw.c,v 1.23 2002/09/05 07:36:23 bardtx Exp $"); - /* internal prototypes */ static void send_user_clip(); Modified: kos-ports/libgl/glfog.c =================================================================== --- kos-ports/libgl/glfog.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/glfog.c 2008-10-21 22:31:18 UTC (rev 615) @@ -12,8 +12,6 @@ #include <assert.h> #include <dc/pvr.h> -CVSID("$Id: glfog.c,v 1.2 2002/04/03 03:36:15 axlen Exp $"); - #define TEST_EQ_4V(a,b) ((a)[0] == (b)[0] && \ (a)[1] == (b)[1] && \ (a)[2] == (b)[2] && \ Modified: kos-ports/libgl/glkos.c =================================================================== --- kos-ports/libgl/glkos.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/glkos.c 2008-10-21 22:31:18 UTC (rev 615) @@ -13,8 +13,6 @@ #include "glinternal.h" #include "glmacros.h" -CVSID("$Id: glkos.c,v 1.14 2002/09/05 07:36:23 bardtx Exp $"); - /* KOS-specific APIs */ int glKosInit() { Modified: kos-ports/libgl/gllight.c =================================================================== --- kos-ports/libgl/gllight.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/gllight.c 2008-10-21 22:31:18 UTC (rev 615) @@ -11,8 +11,6 @@ #include "assert.h" -CVSID("$Id: gllight.c,v 1.5 2002/04/03 03:36:53 axlen Exp $"); - /* Lighting */ void glShadeModel(GLenum mode) { assert_msg(!gl_prim_type, "Not allowed within glBegin/glEnd pair."); Modified: kos-ports/libgl/glmisc.c =================================================================== --- kos-ports/libgl/glmisc.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/glmisc.c 2008-10-21 22:31:18 UTC (rev 615) @@ -13,8 +13,6 @@ #include <stdio.h> #include <string.h> -CVSID("$Id: glmisc.c,v 1.17 2002/07/08 05:28:28 axlen Exp $"); - /* Miscellaneous APIs */ /* Set the background clear color */ Modified: kos-ports/libgl/glmodifier.c =================================================================== --- kos-ports/libgl/glmodifier.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/glmodifier.c 2008-10-21 22:31:18 UTC (rev 615) @@ -17,8 +17,6 @@ #include <dc/matrix.h> #include <dc/pvr.h> -CVSID("$Id"); - volatile pvr_modifier_vol_t *volume; static pvr_modifier_vol_t vol_vbuf, vol_xbuf; pvr_dr_state_t dr_state; Modified: kos-ports/libgl/glnzclip.c =================================================================== --- kos-ports/libgl/glnzclip.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/glnzclip.c 2008-10-21 22:31:18 UTC (rev 615) @@ -24,8 +24,6 @@ #include <dc/matrix.h> #include <dc/pvr.h> -CVSID("$Id:"); - /* Some local tranform stuff. It is generally faster to clip and light verts in view-space. The transform has been broken into two pieces to make that possibe. */ Modified: kos-ports/libgl/gltex.c =================================================================== --- kos-ports/libgl/gltex.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/gltex.c 2008-10-21 22:31:18 UTC (rev 615) @@ -13,8 +13,6 @@ #include <malloc.h> #include <stdio.h> -CVSID("$Id: gltex.c,v 1.11 2002/09/05 07:36:23 bardtx Exp $"); - /* Texture handling */ /* Allocate "texture structures" (really poly context structs) */ Modified: kos-ports/libgl/gltrans.c =================================================================== --- kos-ports/libgl/gltrans.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libgl/gltrans.c 2008-10-21 22:31:18 UTC (rev 615) @@ -13,8 +13,6 @@ #include <dc/fmath.h> #include <dc/matrix.h> -CVSID("$Id: gltrans.c,v 1.13 2002/09/05 07:36:23 bardtx Exp $"); - /* Transformation APIs */ /* Modus operandi, as it were Modified: kos-ports/libkmg/kmg.c =================================================================== --- kos-ports/libkmg/kmg.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libkmg/kmg.c 2008-10-21 22:31:18 UTC (rev 615) @@ -11,8 +11,6 @@ #include <kmg/kmg.h> #include <assert.h> -CVSID("$Id: kmg.c,v 1.2 2003/04/24 02:52:42 bardtx Exp $"); - /* This (tiny) library implements a "KMG" format loader. This format is intended to be a KOS-specific format for loading platform specific image formats directly from the VFS. To put this more clearly, this Modified: kos-ports/libmp3/libmp3/main.c =================================================================== --- kos-ports/libmp3/libmp3/main.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libmp3/libmp3/main.c 2008-10-21 22:31:18 UTC (rev 615) @@ -7,8 +7,6 @@ #include <kos.h> -CVSID("$Id: main.c,v 1.2 2002/01/06 00:40:33 bardtx Exp $"); - int sndserver_thread(void *blagh) { printf("sndserver: started [DEBUG]\r\n"); printf("sndserver: pid is %d; capabilities: MP3, SFX\r\n", thd_get_current()->tid); Modified: kos-ports/libmp3/libmp3/sndmp3.c =================================================================== --- kos-ports/libmp3/libmp3/sndmp3.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libmp3/libmp3/sndmp3.c 2008-10-21 22:31:18 UTC (rev 615) @@ -18,8 +18,6 @@ #include <mp3/sndserver.h> #include <mp3/sndmp3.h> -CVSID("$Id: sndmp3.c,v 1.6 2003/06/19 04:33:03 bardtx Exp $"); - /************************************************************************/ #include <mhead.h> /* From xingmp3 */ #include <port.h> /* From xingmp3 */ Modified: kos-ports/liboggvorbis/liboggvorbisplay/sndoggvorbis.c =================================================================== --- kos-ports/liboggvorbis/liboggvorbisplay/sndoggvorbis.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/liboggvorbis/liboggvorbisplay/sndoggvorbis.c 2008-10-21 22:31:18 UTC (rev 615) @@ -15,8 +15,6 @@ #include <vorbis/vorbisfile.h> #include "misc.h" -CVSID("$Id: sndoggvorbis.c,v 1.13 2003/05/21 03:47:36 bardtx Exp $"); - /* Enable this #define to do timing testing */ /* #define TIMING_TESTS */ Modified: kos-ports/libparallax/src/context.c =================================================================== --- kos-ports/libparallax/src/context.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libparallax/src/context.c 2008-10-21 22:31:18 UTC (rev 615) @@ -12,8 +12,6 @@ #include <plx/context.h> -CVSID("$Id: context.c,v 1.1 2002/09/11 05:53:29 bardtx Exp $"); - /* See the header file for all comments and documentation */ /* Our working context and header */ Modified: kos-ports/libparallax/src/font.c =================================================================== --- kos-ports/libparallax/src/font.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libparallax/src/font.c 2008-10-21 22:31:18 UTC (rev 615) @@ -14,8 +14,6 @@ #include <plx/font.h> #include <plx/prim.h> -CVSID("$Id: font.c,v 1.8 2003/05/21 03:52:29 bardtx Exp $"); - /* See the header file for all comments and documentation */ /* Modified: kos-ports/libparallax/src/mat3d.c =================================================================== --- kos-ports/libparallax/src/mat3d.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libparallax/src/mat3d.c 2008-10-21 22:31:18 UTC (rev 615) @@ -12,8 +12,6 @@ #include <dc/video.h> #include <plx/matrix.h> -CVSID("$Id: mat3d.c,v 1.3 2003/03/09 01:24:11 bardtx Exp $"); - /* Most of this file was pulled from KGL's gltrans.c. Why did we do that instead of just suggesting linking with KGL to get them? Because: Modified: kos-ports/libparallax/src/texture.c =================================================================== --- kos-ports/libparallax/src/texture.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libparallax/src/texture.c 2008-10-21 22:31:18 UTC (rev 615) @@ -15,8 +15,6 @@ #include <jpeg/jpeg.h> #include <kmg/kmg.h> -CVSID("$Id: texture.c,v 1.3 2003/04/24 02:58:49 bardtx Exp $"); - /* See the header file for all comments and documentation */ /* Utility function to fill out the initial poly contexts */ Modified: kos-ports/libpcx/pcx.c =================================================================== --- kos-ports/libpcx/pcx.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libpcx/pcx.c 2008-10-21 22:31:18 UTC (rev 615) @@ -10,8 +10,6 @@ #include <pcx/pcx.h> #include <assert.h> -CVSID("$Id: pcx.c,v 1.4 2003/06/19 04:33:03 bardtx Exp $"); - typedef struct { char mfg; /* manufacturer, always 0xa0 */ char ver; /* encoder version number (5) */ Modified: kos-ports/libpcx/pcx_texture.c =================================================================== --- kos-ports/libpcx/pcx_texture.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libpcx/pcx_texture.c 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <kos.h> #include <pcx/pcx.h> -CVSID("$Id: pcx_texture.c,v 1.1 2002/04/07 01:54:29 bardtx Exp $"); - /* Adjusts a 16-bit image so that instead of RGB565 gray scales, you will have ARGB4444 alpha scales. The resulting image will be entirely white. */ /* Imported here to avoid a dependency on libdcutils.a */ Modified: kos-ports/libs3m/s3m.c =================================================================== --- kos-ports/libs3m/s3m.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libs3m/s3m.c 2008-10-21 22:31:18 UTC (rev 615) @@ -7,12 +7,9 @@ #include <kos.h> -CVSID("$Id: s3m.c,v 1.2 2002/01/06 00:40:33 bardtx Exp $"); static uint32 ram_top; - - uint32 sfx_load_sample(const uint16 *src, uint32 len) { uint32 where; Modified: kos-ports/libs3m/sfxmgr.c =================================================================== --- kos-ports/libs3m/sfxmgr.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libs3m/sfxmgr.c 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <kos.h> -CVSID("$Id: sfxmgr.c,v 1.2 2002/01/06 00:40:33 bardtx Exp $"); - typedef struct { uint32 loc, len; uint32 rate; Modified: kos-ports/libtga/tga.c =================================================================== --- kos-ports/libtga/tga.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtga/tga.c 2008-10-21 22:31:18 UTC (rev 615) @@ -17,8 +17,6 @@ #include <tga/tga.h> #include <assert.h> -CVSID("$Id: tga.c,v 1.6 2003/06/19 04:33:03 bardtx Exp $"); - typedef struct { uint8 image_id_length __attribute__((packed)); /* Length of Image ID field */ uint8 colormap_type __attribute__((packed)); /* Color Map type */ Modified: kos-ports/libtga/tga_texture.c =================================================================== --- kos-ports/libtga/tga_texture.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtga/tga_texture.c 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <kos.h> #include <tga/tga.h> -CVSID("$Id: tga_texture.c,v 1.2 2002/04/07 02:34:27 bardtx Exp $"); - /* Loads a TGA file into texture RAM, potentially twiddling it. TGA files already include an alpha channel. */ int tga_load_texture(const char *fn, int twiddle, uint32 *txr_out, int *w, int *h) { Modified: kos-ports/libtremor/kos/sndoggvorbis.c =================================================================== --- kos-ports/libtremor/kos/sndoggvorbis.c 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtremor/kos/sndoggvorbis.c 2008-10-21 22:31:18 UTC (rev 615) @@ -15,8 +15,6 @@ #include "ivorbisfile.h" #include "misc.h" -CVSID("$Id: sndoggvorbis.c,v 1.13 2003/05/21 03:47:36 bardtx Exp $"); - /* Enable this #define to do timing testing */ /* #define TIMING_TESTS */ Modified: kos-ports/libtsunami/doc/conventions.txt =================================================================== --- kos-ports/libtsunami/doc/conventions.txt 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/doc/conventions.txt 2008-10-21 22:31:18 UTC (rev 615) @@ -35,5 +35,3 @@ - Constants are like type names - Generally all members should be private, and have an m_ prefix. - Things that don't modify the class should be const. - -CVS Id: $Id: conventions.txt,v 1.1 2002/09/09 08:43:37 bardtx Exp $ Modified: kos-ports/libtsunami/doc/readme.txt =================================================================== --- kos-ports/libtsunami/doc/readme.txt 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/doc/readme.txt 2008-10-21 22:31:18 UTC (rev 615) @@ -59,6 +59,3 @@ auto_ptrs, causing the programmer to have to defacto manually reference count anyway). - -CVS Id: $Id: readme.txt,v 1.1 2002/09/09 08:43:37 bardtx Exp $ - Modified: kos-ports/libtsunami/doc/specs.txt =================================================================== --- kos-ports/libtsunami/doc/specs.txt 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/doc/specs.txt 2008-10-21 22:31:18 UTC (rev 615) @@ -21,5 +21,3 @@ platform provided a port is done of any plat-specific code in the actual object draw routines. - -CVS Id: $Id: specs.txt,v 1.1 2002/09/09 08:43:37 bardtx Exp $ Modified: kos-ports/libtsunami/doc/status.txt =================================================================== --- kos-ports/libtsunami/doc/status.txt 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/doc/status.txt 2008-10-21 22:31:18 UTC (rev 615) @@ -10,5 +10,3 @@ - Environmental object: not started - Predefined objects: partially done - -CVS Id: $Id: status.txt,v 1.1 2002/09/09 08:43:37 bardtx Exp $ Modified: kos-ports/libtsunami/src/animation.cpp =================================================================== --- kos-ports/libtsunami/src/animation.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/animation.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <tsu/animation.h> #include <tsu/drawable.h> -CVSID("$Id: animation.cpp,v 1.2 2003/04/24 02:57:20 bardtx Exp $"); - Animation::Animation() { } Modified: kos-ports/libtsunami/src/anims/alphafader.cpp =================================================================== --- kos-ports/libtsunami/src/anims/alphafader.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/anims/alphafader.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <tsu/drawable.h> #include <tsu/anims/alphafader.h> -CVSID("$Id: alphafader.cpp,v 1.2 2003/04/24 02:57:20 bardtx Exp $"); - AlphaFader::AlphaFader(float fade_to, float delta) { m_fade_to = fade_to; m_delta = delta; Modified: kos-ports/libtsunami/src/anims/expxymover.cpp =================================================================== --- kos-ports/libtsunami/src/anims/expxymover.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/anims/expxymover.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <tsu/drawable.h> #include <tsu/anims/expxymover.h> -CVSID("$Id: expxymover.cpp,v 1.1 2002/09/09 08:43:37 bardtx Exp $"); - ExpXYMover::ExpXYMover(float dx, float dy, float maxx, float maxy) { m_dx = dx; m_dy = dy; Modified: kos-ports/libtsunami/src/anims/logxymover.cpp =================================================================== --- kos-ports/libtsunami/src/anims/logxymover.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/anims/logxymover.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <tsu/anims/logxymover.h> #include <math.h> -CVSID("$Id: logxymover.cpp,v 1.1 2002/09/09 08:43:37 bardtx Exp $"); - LogXYMover::LogXYMover(float dstx, float dsty) { m_dstx = dstx; m_dsty = dsty; Modified: kos-ports/libtsunami/src/anims/tintfader.cpp =================================================================== --- kos-ports/libtsunami/src/anims/tintfader.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/anims/tintfader.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <tsu/drawable.h> #include <tsu/anims/tintfader.h> -CVSID("$Id: tintfader.cpp,v 1.1 2003/04/24 02:57:20 bardtx Exp $"); - TintFader::TintFader(const Color & fade_to, const Color & delta) { m_fade_to = fade_to; m_delta = delta; Modified: kos-ports/libtsunami/src/drawable.cpp =================================================================== --- kos-ports/libtsunami/src/drawable.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/drawable.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <tsu/drawable.h> #include <plx/matrix.h> -CVSID("$Id: drawable.cpp,v 1.3 2003/04/24 02:57:20 bardtx Exp $"); - // Constructor / Destructor Drawable::Drawable() { m_trans.zero(); Modified: kos-ports/libtsunami/src/drawables/banner.cpp =================================================================== --- kos-ports/libtsunami/src/drawables/banner.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/drawables/banner.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -8,8 +8,6 @@ #include <tsu/drawables/banner.h> -CVSID("$Id: banner.cpp,v 1.3 2003/04/24 02:57:20 bardtx Exp $"); - Banner::Banner(int list, Texture * texture) { m_list = list; m_texture = texture; Modified: kos-ports/libtsunami/src/drawables/label.cpp =================================================================== --- kos-ports/libtsunami/src/drawables/label.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/drawables/label.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <plx/list.h> #include <tsu/drawables/label.h> -CVSID("$Id: label.cpp,v 1.3 2003/04/24 02:57:21 bardtx Exp $"); - Label::Label(Font * fh, const char *text, int size, bool centered, bool smear) { m_fh = fh; m_text = text; Modified: kos-ports/libtsunami/src/font.cpp =================================================================== --- kos-ports/libtsunami/src/font.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/font.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -8,8 +8,6 @@ #include <tsu/font.h> -CVSID("$Id: font.cpp,v 1.3 2003/04/24 02:57:20 bardtx Exp $"); - Font::Font(const char *fn, int list) { m_list = list; m_font = NULL; Modified: kos-ports/libtsunami/src/matrix.cpp =================================================================== --- kos-ports/libtsunami/src/matrix.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/matrix.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -10,8 +10,6 @@ #include <tsu/matrix.h> #include <string.h> -CVSID("$Id: font.cpp,v 1.3 2003/04/24 02:57:20 bardtx Exp $"); - /* Several pieces of this file were pulled from libparallax, which was in turn pulled from KGL. */ Modified: kos-ports/libtsunami/src/matrixdouble.cpp =================================================================== --- kos-ports/libtsunami/src/matrixdouble.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/matrixdouble.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -11,8 +11,6 @@ #include <tsu/matrix.h> #include <string.h> -CVSID("$Id: font.cpp,v 1.3 2003/04/24 02:57:20 bardtx Exp $"); - /* Several pieces of this file were pulled from libparallax, which was in turn pulled from KGL. */ Modified: kos-ports/libtsunami/src/sound.cpp =================================================================== --- kos-ports/libtsunami/src/sound.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/sound.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -8,8 +8,6 @@ #include <tsu/sound.h> -CVSID("$Id: sound.cpp,v 1.3 2003/04/24 02:57:20 bardtx Exp $"); - int Sound::m_default_vol = 240; Sound::Sound(const char *fn) { Modified: kos-ports/libtsunami/src/texture.cpp =================================================================== --- kos-ports/libtsunami/src/texture.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/texture.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -8,8 +8,6 @@ #include <tsu/texture.h> -CVSID("$Id: texture.cpp,v 1.3 2003/04/24 02:57:20 bardtx Exp $"); - Texture::Texture(const char *fn, bool use_alpha, bool yflip) { m_txr = NULL; if (!loadFromFile(fn, use_alpha, yflip)) Modified: kos-ports/libtsunami/src/trigger.cpp =================================================================== --- kos-ports/libtsunami/src/trigger.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/trigger.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <tsu/trigger.h> #include <tsu/animation.h> -CVSID("$Id: trigger.cpp,v 1.1 2002/09/09 08:43:37 bardtx Exp $"); - Trigger::Trigger() { } Modified: kos-ports/libtsunami/src/triggers/birth.cpp =================================================================== --- kos-ports/libtsunami/src/triggers/birth.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/triggers/birth.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <tsu/triggers/birth.h> #include <tsu/drawable.h> -CVSID("$Id: death.cpp,v 1.1 2002/09/09 08:43:38 bardtx Exp $"); - Birth::Birth(Drawable * newDrawable, Drawable * target) { m_newDrawable = newDrawable; m_target = target; Modified: kos-ports/libtsunami/src/triggers/death.cpp =================================================================== --- kos-ports/libtsunami/src/triggers/death.cpp 2008-10-19 01:09:31 UTC (rev 614) +++ kos-ports/libtsunami/src/triggers/death.cpp 2008-10-21 22:31:18 UTC (rev 615) @@ -9,8 +9,6 @@ #include <tsu/triggers/death.h> #include <tsu/drawable.h> -CVSID("$Id: death.cpp,v 1.1 2002/09/09 08:43:38 bardtx Exp $"); - Death::Death(Drawable * target) { m_target = target; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2008-10-19 01:09:33
|
Revision: 614 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=614&view=rev Author: fackue Date: 2008-10-19 01:09:31 +0000 (Sun, 19 Oct 2008) Log Message: ----------- Fixing hello-mp3 example's compiler warnings Modified Paths: -------------- kos/examples/dreamcast/sound/hello-mp3/mp3test.c Modified: kos/examples/dreamcast/sound/hello-mp3/mp3test.c =================================================================== --- kos/examples/dreamcast/sound/hello-mp3/mp3test.c 2008-10-18 02:17:10 UTC (rev 613) +++ kos/examples/dreamcast/sound/hello-mp3/mp3test.c 2008-10-19 01:09:31 UTC (rev 614) @@ -14,7 +14,7 @@ /* Modified to be an MP3 sample by Dan Potter */ #include <kos.h> -#include <mp3/sndmp3.h> +#include <mp3/sndserver.h> #include "display.c" extern uint8 romdisk[]; @@ -23,7 +23,7 @@ KOS_INIT_FLAGS(INIT_DEFAULT | INIT_MALLOCSTATS); KOS_INIT_ROMDISK(romdisk); -int main(int argc, char **argv) +int main(int argc, char **argv) { cont_cond_t cond; @@ -32,14 +32,14 @@ snd_stream_init(); mp3_init(); print_d("sndmp3_init(); called...\n"); - + mp3_start("/rd/test.mp3",0); print_d("mp3_start(\"/rd/test.mp3\",0); called...\n\n"); - + /* printf("main: Vorbisfile artist=%s\r\n",sndoggvorbis_getartist()); printf("main: Vorbisfile title=%s\r\n",sndoggvorbis_gettitle()); */ - + print_d("The MP3 File now plays within a thread !\n\n"); print_d("Press START to exit and (Y) to re-start playing..."); @@ -63,7 +63,7 @@ printf("main: Vorbisfile current bitrate %ld\r\n",bitratenew); bitrateold = bitratenew; } */ - + } mp3_stop(); mp3_shutdown(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2008-10-18 02:17:12
|
Revision: 613 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=613&view=rev Author: fackue Date: 2008-10-18 02:17:10 +0000 (Sat, 18 Oct 2008) Log Message: ----------- Fixed libmp3's header issue Modified Paths: -------------- kos-ports/Makefile Modified: kos-ports/Makefile =================================================================== --- kos-ports/Makefile 2008-10-18 02:08:16 UTC (rev 612) +++ kos-ports/Makefile 2008-10-18 02:17:10 UTC (rev 613) @@ -1,9 +1,8 @@ SUBDIRS := libbz2 libconio libdcplib libgl libimageload libjpeg libkmg libkosh \ libmodplug libmp3 liboggvorbis libparallax libpcx libpng libs3m libtga \ - libtremor libtsunami lua lwip zlib SDL SDL_flic SDL_gfx SDL_image-1.2.4 SDL_mixer-1.2.6 \ - SDL_prim SFont freetype lib3ds lib7z libkglx liblzma libmxml libpbm libpng-1.2.8 \ - SDL-1.2.9 zlib-1.2.3 SDL_ttf SGE libglx + libtremor libtsunami lua lwip zlib SDL + all: $(patsubst %, _dir_%, $(SUBDIRS)) $(patsubst %, _dir_%, $(SUBDIRS)): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2008-10-18 02:08:26
|
Revision: 612 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=612&view=rev Author: fackue Date: 2008-10-18 02:08:16 +0000 (Sat, 18 Oct 2008) Log Message: ----------- Fixed libmp3's header issue Modified Paths: -------------- kos-ports/Makefile kos-ports/include/mp3/sndserver.h Modified: kos-ports/Makefile =================================================================== --- kos-ports/Makefile 2008-09-22 23:59:53 UTC (rev 611) +++ kos-ports/Makefile 2008-10-18 02:08:16 UTC (rev 612) @@ -1,6 +1,8 @@ SUBDIRS := libbz2 libconio libdcplib libgl libimageload libjpeg libkmg libkosh \ libmodplug libmp3 liboggvorbis libparallax libpcx libpng libs3m libtga \ - libtremor libtsunami lua lwip zlib SDL + libtremor libtsunami lua lwip zlib SDL SDL_flic SDL_gfx SDL_image-1.2.4 SDL_mixer-1.2.6 \ + SDL_prim SFont freetype lib3ds lib7z libkglx liblzma libmxml libpbm libpng-1.2.8 \ + SDL-1.2.9 zlib-1.2.3 SDL_ttf SGE libglx all: $(patsubst %, _dir_%, $(SUBDIRS)) Modified: kos-ports/include/mp3/sndserver.h =================================================================== --- kos-ports/include/mp3/sndserver.h 2008-09-22 23:59:53 UTC (rev 611) +++ kos-ports/include/mp3/sndserver.h 2008-10-18 02:08:16 UTC (rev 612) @@ -4,7 +4,7 @@ (c)2000 Dan Potter $Id: sndserver.h,v 1.1 2003/02/27 03:46:30 bardtx Exp $ - + */ #ifndef __SNDSERVER_H @@ -26,7 +26,7 @@ int mp3_stop(); /* Shuts down the MP3 server thread */ -int mp3_quit(); +int mp3_shutdown(); /* Controls volume level of stream */ void mp3_volume(int vol); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-09-23 00:00:50
|
Revision: 611 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=611&view=rev Author: ljsebald Date: 2008-09-22 23:59:53 +0000 (Mon, 22 Sep 2008) Log Message: ----------- I apologize for the huge email this will probably generate, but it really needed to be done. Removing all the old CVSID stuff from the kos tree. Modified Paths: -------------- kos/Makefile kos/Makefile.prefab kos/Makefile.rules kos/addons/Makefile kos/addons/Makefile.prefab kos/addons/include/kos/bspline.h kos/addons/include/kos/img.h kos/addons/include/kos/netcfg.h kos/addons/include/kos/pcx.h kos/addons/include/kos/vector.h kos/addons/libkosutils/Makefile kos/addons/libkosutils/img.c kos/addons/libkosutils/pcx_small.c kos/doc/CHANGELOG kos/doc/FAQ kos/doc/LICENSE kos/doc/README kos/doc/README.BSD kos/doc/README.GPL kos/doc/README.KOS kos/doc/RELNOTES kos/doc/coding_style.txt kos/doc/goals.txt kos/examples/Makefile kos/examples/dreamcast/2ndmix/2ndmix.c kos/examples/dreamcast/2ndmix/Makefile kos/examples/dreamcast/Makefile kos/examples/dreamcast/basic/Makefile kos/examples/dreamcast/basic/fpu/Makefile kos/examples/dreamcast/basic/mmu/Makefile kos/examples/dreamcast/basic/threading/Makefile kos/examples/dreamcast/basic/threading/general/Makefile kos/examples/dreamcast/conio/Makefile kos/examples/dreamcast/conio/adventure/Makefile kos/examples/dreamcast/conio/basic/Makefile kos/examples/dreamcast/conio/wump/Makefile kos/examples/dreamcast/cpp/Makefile kos/examples/dreamcast/kgl/Makefile kos/examples/dreamcast/kgl/basic/Makefile kos/examples/dreamcast/kgl/basic/scissor/Makefile kos/examples/dreamcast/kgl/basic/scissor/scissor.c kos/examples/dreamcast/kgl/basic/texwrap/Makefile kos/examples/dreamcast/kgl/basic/texwrap/texwrap.c kos/examples/dreamcast/kgl/basic/vfzclip/Makefile kos/examples/dreamcast/kgl/basic/vfzclip/vfzclip.c kos/examples/dreamcast/kgl/benchmarks/Makefile kos/examples/dreamcast/kgl/benchmarks/quadmark/quadmark.c kos/examples/dreamcast/kgl/benchmarks/trimark/trimark.c kos/examples/dreamcast/kgl/demos/Makefile kos/examples/dreamcast/kgl/demos/tunnel/Makefile kos/examples/dreamcast/kgl/demos/tunnel/menu.cpp kos/examples/dreamcast/kgl/demos/tunnel/menu.h kos/examples/dreamcast/kgl/demos/tunnel/plprint.cpp kos/examples/dreamcast/kgl/demos/tunnel/plprint.h kos/examples/dreamcast/kgl/demos/tunnel/tunnel.cpp kos/examples/dreamcast/kgl/nehe/Makefile kos/examples/dreamcast/kgl/nehe/nehe26/data/Makefile kos/examples/dreamcast/lua/Makefile kos/examples/dreamcast/lua/basic/Makefile kos/examples/dreamcast/lua/basic/lua.c kos/examples/dreamcast/modem/Makefile kos/examples/dreamcast/network/Makefile kos/examples/dreamcast/network/httpd/httpd.c kos/examples/dreamcast/parallax/Makefile kos/examples/dreamcast/pvr/Makefile kos/examples/dreamcast/sound/Makefile kos/examples/dreamcast/sound/cdda/Makefile kos/examples/dreamcast/tsunami/Makefile kos/examples/dreamcast/video/Makefile kos/examples/dreamcast/video/bfont/Makefile kos/examples/dreamcast/vmu/Makefile kos/examples/gba/Makefile kos/examples/gba/pogo-keen/Makefile kos/examples/ps2/Makefile kos/examples/ps2/basic/Makefile kos/include/assert.h kos/include/endian.h kos/include/kos/cdefs.h kos/include/kos/cond.h kos/include/kos/dbgio.h kos/include/kos/dbglog.h kos/include/kos/elf.h kos/include/kos/exports.h kos/include/kos/fs.h kos/include/kos/fs_builtin.h kos/include/kos/fs_pty.h kos/include/kos/fs_ramdisk.h kos/include/kos/fs_romdisk.h kos/include/kos/genwait.h kos/include/kos/iovec.h kos/include/kos/library.h kos/include/kos/limits.h kos/include/kos/mutex.h kos/include/kos/net.h kos/include/kos/nmmgr.h kos/include/kos/sem.h kos/include/kos/thread.h kos/include/kos.h kos/include/malloc.h kos/include/pthread.h kos/kernel/Makefile kos/kernel/arch/Makefile kos/kernel/arch/dreamcast/Makefile kos/kernel/arch/dreamcast/fs/Makefile kos/kernel/arch/dreamcast/fs/dcload-syscall.s kos/kernel/arch/dreamcast/fs/fs_dclnative.c kos/kernel/arch/dreamcast/fs/fs_dcload.c kos/kernel/arch/dreamcast/fs/fs_iso9660.c kos/kernel/arch/dreamcast/fs/fs_vmu.c kos/kernel/arch/dreamcast/fs/vmufs.c kos/kernel/arch/dreamcast/hardware/Makefile kos/kernel/arch/dreamcast/hardware/asic.c kos/kernel/arch/dreamcast/hardware/cdrom.c kos/kernel/arch/dreamcast/hardware/g2bus.c kos/kernel/arch/dreamcast/hardware/hardware.c kos/kernel/arch/dreamcast/hardware/maple/Makefile kos/kernel/arch/dreamcast/hardware/maple/controller.c kos/kernel/arch/dreamcast/hardware/maple/keyboard.c kos/kernel/arch/dreamcast/hardware/maple/maple_compat.c kos/kernel/arch/dreamcast/hardware/maple/maple_enum.c kos/kernel/arch/dreamcast/hardware/maple/maple_irq.c kos/kernel/arch/dreamcast/hardware/maple/maple_queue.c kos/kernel/arch/dreamcast/hardware/maple/maple_utils.c kos/kernel/arch/dreamcast/hardware/maple/mouse.c kos/kernel/arch/dreamcast/hardware/maple/vmu.c kos/kernel/arch/dreamcast/hardware/modem/Makefile kos/kernel/arch/dreamcast/hardware/modem/mintern.h kos/kernel/arch/dreamcast/hardware/modem/mintr.c kos/kernel/arch/dreamcast/hardware/modem/modem.c kos/kernel/arch/dreamcast/hardware/network/Makefile kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c kos/kernel/arch/dreamcast/hardware/pvr/Makefile kos/kernel/arch/dreamcast/hardware/pvr/pvr_buffers.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_dma.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_fog.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_fog_tables.h kos/kernel/arch/dreamcast/hardware/pvr/pvr_globals.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_init_shutdown.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_irq.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_mem.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_mem_core.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_mem_core.h kos/kernel/arch/dreamcast/hardware/pvr/pvr_misc.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_palette.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_prim.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_scene.c kos/kernel/arch/dreamcast/hardware/pvr/pvr_texture.c kos/kernel/arch/dreamcast/hardware/spudma.c kos/kernel/arch/dreamcast/hardware/video.c kos/kernel/arch/dreamcast/include/arch/arch.h kos/kernel/arch/dreamcast/include/arch/cache.h kos/kernel/arch/dreamcast/include/arch/exec.h kos/kernel/arch/dreamcast/include/arch/gdb.h kos/kernel/arch/dreamcast/include/arch/irq.h kos/kernel/arch/dreamcast/include/arch/mmu.h kos/kernel/arch/dreamcast/include/arch/rtc.h kos/kernel/arch/dreamcast/include/arch/spinlock.h kos/kernel/arch/dreamcast/include/arch/stack.h kos/kernel/arch/dreamcast/include/arch/timer.h kos/kernel/arch/dreamcast/include/arch/types.h kos/kernel/arch/dreamcast/include/dc/asic.h kos/kernel/arch/dreamcast/include/dc/biosfont.h kos/kernel/arch/dreamcast/include/dc/cdrom.h kos/kernel/arch/dreamcast/include/dc/fmath.h kos/kernel/arch/dreamcast/include/dc/fs_iso9660.h kos/kernel/arch/dreamcast/include/dc/fs_vmu.h kos/kernel/arch/dreamcast/include/dc/g2bus.h kos/kernel/arch/dreamcast/include/dc/maple/controller.h kos/kernel/arch/dreamcast/include/dc/maple/keyboard.h kos/kernel/arch/dreamcast/include/dc/maple/mouse.h kos/kernel/arch/dreamcast/include/dc/maple/purupuru.h kos/kernel/arch/dreamcast/include/dc/maple/vmu.h kos/kernel/arch/dreamcast/include/dc/maple.h kos/kernel/arch/dreamcast/include/dc/matrix.h kos/kernel/arch/dreamcast/include/dc/matrix3d.h kos/kernel/arch/dreamcast/include/dc/modem/mconst.h kos/kernel/arch/dreamcast/include/dc/modem/modem.h kos/kernel/arch/dreamcast/include/dc/net/broadband_adapter.h kos/kernel/arch/dreamcast/include/dc/net/lan_adapter.h kos/kernel/arch/dreamcast/include/dc/pvr.h kos/kernel/arch/dreamcast/include/dc/sound/sfxmgr.h kos/kernel/arch/dreamcast/include/dc/sound/sound.h kos/kernel/arch/dreamcast/include/dc/sound/stream.h kos/kernel/arch/dreamcast/include/dc/spu.h kos/kernel/arch/dreamcast/include/dc/sq.h kos/kernel/arch/dreamcast/include/dc/ubc.h kos/kernel/arch/dreamcast/include/dc/vblank.h kos/kernel/arch/dreamcast/include/dc/video.h kos/kernel/arch/dreamcast/include/dc/vmu_pkg.h kos/kernel/arch/dreamcast/include/navi/flash.h kos/kernel/arch/dreamcast/include/navi/ide.h kos/kernel/arch/dreamcast/kernel/Makefile kos/kernel/arch/dreamcast/kernel/cache.s kos/kernel/arch/dreamcast/kernel/entry.s kos/kernel/arch/dreamcast/kernel/exec.c kos/kernel/arch/dreamcast/kernel/execasm.s kos/kernel/arch/dreamcast/kernel/init.c kos/kernel/arch/dreamcast/kernel/init_flags_default.c kos/kernel/arch/dreamcast/kernel/init_romdisk_default.c kos/kernel/arch/dreamcast/kernel/irq.c kos/kernel/arch/dreamcast/kernel/itlb.s kos/kernel/arch/dreamcast/kernel/mmu.c kos/kernel/arch/dreamcast/kernel/panic.c kos/kernel/arch/dreamcast/kernel/ser_console.c kos/kernel/arch/dreamcast/kernel/stack.c kos/kernel/arch/dreamcast/kernel/startup.s kos/kernel/arch/dreamcast/kernel/thdswitch.s kos/kernel/arch/dreamcast/kernel/timer.c kos/kernel/arch/dreamcast/math/Makefile kos/kernel/arch/dreamcast/math/matrix3d.c kos/kernel/arch/dreamcast/navi/Makefile kos/kernel/arch/dreamcast/navi/navi_flash.c kos/kernel/arch/dreamcast/navi/navi_ide.c kos/kernel/arch/dreamcast/sound/Makefile kos/kernel/arch/dreamcast/sound/arm/aica_cmd_iface.h kos/kernel/arch/dreamcast/sound/snd_iface.c kos/kernel/arch/dreamcast/sound/snd_mem.c kos/kernel/arch/dreamcast/sound/snd_sfxmgr.c kos/kernel/arch/dreamcast/sound/snd_stream.c kos/kernel/arch/dreamcast/util/Makefile kos/kernel/arch/dreamcast/util/vmu_pkg.c kos/kernel/arch/gba/Makefile kos/kernel/arch/gba/gba.ld.script kos/kernel/arch/gba/include/arch/arch.h kos/kernel/arch/gba/include/arch/dbgio.h kos/kernel/arch/gba/include/arch/irq.h kos/kernel/arch/gba/include/arch/spinlock.h kos/kernel/arch/gba/include/arch/syscall.h kos/kernel/arch/gba/include/arch/timer.h kos/kernel/arch/gba/include/arch/types.h kos/kernel/arch/gba/include/gba/dma.h kos/kernel/arch/gba/include/gba/keys.h kos/kernel/arch/gba/include/gba/sound.h kos/kernel/arch/gba/include/gba/sprite.h kos/kernel/arch/gba/include/gba/video.h kos/kernel/arch/gba/kernel/Makefile kos/kernel/arch/gba/kernel/dbgio.c kos/kernel/arch/gba/kernel/init_flags_default.c kos/kernel/arch/gba/kernel/init_romdisk_default.c kos/kernel/arch/gba/kernel/main.c kos/kernel/arch/gba/kernel/mm.c kos/kernel/arch/gba/kernel/panic.c kos/kernel/arch/gba/kernel/startup.s kos/kernel/arch/ia32/Makefile kos/kernel/arch/ia32/boot/Makefile kos/kernel/arch/ia32/include/arch/arch.h kos/kernel/arch/ia32/include/arch/cache.h kos/kernel/arch/ia32/include/arch/dbgio.h kos/kernel/arch/ia32/include/arch/exec.h kos/kernel/arch/ia32/include/arch/gdb.h kos/kernel/arch/ia32/include/arch/irq.h kos/kernel/arch/ia32/include/arch/mmu.h kos/kernel/arch/ia32/include/arch/rtc.h kos/kernel/arch/ia32/include/arch/spinlock.h kos/kernel/arch/ia32/include/arch/stack.h kos/kernel/arch/ia32/include/arch/timer.h kos/kernel/arch/ia32/include/arch/types.h kos/kernel/arch/ia32/include/ia32/ports.h kos/kernel/arch/ia32/kernel/Makefile kos/kernel/arch/ia32/kernel/dbgio.c kos/kernel/arch/ia32/kernel/exec.c kos/kernel/arch/ia32/kernel/init_flags_default.c kos/kernel/arch/ia32/kernel/mmu.c kos/kernel/arch/ia32/kernel/panic.c kos/kernel/arch/ia32/kernel/rtc.c kos/kernel/arch/ia32/kernel/stack.c kos/kernel/arch/ia32/kernel/timer.c kos/kernel/arch/ps2/Makefile kos/kernel/arch/ps2/fs/Makefile kos/kernel/arch/ps2/fs/fs_ps2load.c kos/kernel/arch/ps2/include/arch/arch.h kos/kernel/arch/ps2/include/arch/atexit.h kos/kernel/arch/ps2/include/arch/cache.h kos/kernel/arch/ps2/include/arch/dbgio.h kos/kernel/arch/ps2/include/arch/irq.h kos/kernel/arch/ps2/include/arch/rtc.h kos/kernel/arch/ps2/include/arch/spinlock.h kos/kernel/arch/ps2/include/arch/syscall.h kos/kernel/arch/ps2/include/arch/timer.h kos/kernel/arch/ps2/include/arch/types.h kos/kernel/arch/ps2/include/ps2/asmregs.h kos/kernel/arch/ps2/include/ps2/ioports.h kos/kernel/arch/ps2/include/ps2/sbios.h kos/kernel/arch/ps2/kernel/Makefile kos/kernel/arch/ps2/kernel/atexit.c kos/kernel/arch/ps2/kernel/cache.S kos/kernel/arch/ps2/kernel/crtbegin.c kos/kernel/arch/ps2/kernel/crtend.c kos/kernel/arch/ps2/kernel/dbgio.c kos/kernel/arch/ps2/kernel/entry.S kos/kernel/arch/ps2/kernel/init_flags_default.c kos/kernel/arch/ps2/kernel/init_romdisk_default.c kos/kernel/arch/ps2/kernel/main.c kos/kernel/arch/ps2/kernel/mm.c kos/kernel/arch/ps2/kernel/panic.c kos/kernel/arch/ps2/kernel/startup.S kos/kernel/arch/ps2/kernel/syscall.c kos/kernel/arch/ps2/kernel/timer.c kos/kernel/arch/ps2/sbios/Makefile kos/kernel/arch/ps2/sbios/sbios_init_shutdown.c kos/kernel/debug/Makefile kos/kernel/exports/Makefile kos/kernel/exports/library.c kos/kernel/exports/nmmgr.c kos/kernel/fs/Makefile kos/kernel/fs/elf.c kos/kernel/fs/fs.c kos/kernel/fs/fs_pty.c kos/kernel/fs/fs_ramdisk.c kos/kernel/fs/fs_romdisk.c kos/kernel/fs/fs_utils.c kos/kernel/libc/koslib/abort.c kos/kernel/libc/koslib/assert.c kos/kernel/libc/koslib/byteorder.c kos/kernel/libc/koslib/memcpy2.c kos/kernel/libc/koslib/memcpy4.c kos/kernel/libc/koslib/memset2.c kos/kernel/libc/koslib/memset4.c kos/kernel/libc/koslib/usleep.c kos/kernel/mm/Makefile kos/kernel/mm/cplusplus.c kos/kernel/mm/malloc_debug.c kos/kernel/net/Makefile kos/kernel/net/net_arp.c kos/kernel/net/net_icmp.c kos/kernel/net/net_input.c kos/kernel/thread/Makefile kos/kernel/thread/cond.c kos/kernel/thread/genwait.c kos/kernel/thread/mutex.c kos/kernel/thread/sem.c kos/kernel/thread/thread.c kos/libk++/mem.cc kos/libk++/pure_virtual.c kos/loadable/Makefile.prefab kos/utils/Makefile kos/utils/bin2c/Makefile kos/utils/bin2c/bin2c.c kos/utils/bin2o/bin2o kos/utils/bincnv/Makefile kos/utils/bincnv/bincnv.c kos/utils/cvs_utils/vcheck.py kos/utils/gba-crcfix/gba-crcfix.c kos/utils/gba-elf2bin/gba-elf2bin kos/utils/ipload/ipload.py kos/utils/isotest/Makefile kos/utils/isotest/isotest.c kos/utils/kmgenc/readpng.c kos/utils/rdtest/Makefile kos/utils/rdtest/rdtest.c kos/utils/version/version.sh kos/utils/vqenc/readpng.c Modified: kos/Makefile =================================================================== --- kos/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # Root Makefile # Copyright (C)2003 Dan Potter -# -# $Id: Makefile,v 1.5 2002/04/20 17:23:31 bardtx Exp $ +# # Add stuff to DIRS to auto-compile it with the big tree. DIRS = utils Modified: kos/Makefile.prefab =================================================================== --- kos/Makefile.prefab 2008-09-21 18:39:06 UTC (rev 610) +++ kos/Makefile.prefab 2008-09-22 23:59:53 UTC (rev 611) @@ -2,10 +2,8 @@ # # Root Makefile.prefab # (c)2000 Dan Potter -# -# $Id: Makefile.prefab,v 1.2 2002/02/09 06:16:00 bardtx Exp $ +# - # Global KallistiOS Makefile include # Define "SUBDIRS" and "OBJS", and then include this file; # it will handle a lot of your build process. Modified: kos/Makefile.rules =================================================================== --- kos/Makefile.rules 2008-09-21 18:39:06 UTC (rev 610) +++ kos/Makefile.rules 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # Makefile.rules # (c)2000-2001 Dan Potter -# -# $Id: Makefile.rules,v 1.9 2003/02/27 04:49:53 bardtx Exp $ +# # Global KallistiOS Makefile include Modified: kos/addons/Makefile =================================================================== --- kos/addons/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # addons/Makefile # Copyright (C)2003 Dan Potter -# -# $Id: Makefile,v 1.21 2003/04/24 02:52:42 bardtx Exp $ +# # What we want to do here, unlike previous versions, is to setup a system # where you can just untar/unzip any port you want into here and it Modified: kos/addons/Makefile.prefab =================================================================== --- kos/addons/Makefile.prefab 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/Makefile.prefab 2008-09-22 23:59:53 UTC (rev 611) @@ -2,10 +2,8 @@ # # Addons Makefile.prefab # Copyright (C)2003 Dan Potter -# -# $Id: Makefile.prefab,v 1.2 2002/02/09 06:16:00 bardtx Exp $ +# - # KallistiOS addons Makefile include # # Define "TARGET", "SUBDIRS" and "OBJS", and then include this file; Modified: kos/addons/include/kos/bspline.h =================================================================== --- kos/addons/include/kos/bspline.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/include/kos/bspline.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,7 +3,6 @@ bspline.h (c)2000 Dan Potter - $Id: bspline.h,v 1.1 2002/09/05 07:31:55 bardtx Exp $ */ #ifndef __KOS_BSPLINE_H Modified: kos/addons/include/kos/img.h =================================================================== --- kos/addons/include/kos/img.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/include/kos/img.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/img.h (c)2002 Dan Potter - $Id: img.h,v 1.4 2003/04/24 03:00:44 bardtx Exp $ - */ #ifndef __KOS_IMG_H Modified: kos/addons/include/kos/netcfg.h =================================================================== --- kos/addons/include/kos/netcfg.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/include/kos/netcfg.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/netcfg.h Copyright (C)2003 Dan Potter - $Id: netcfg.h,v 1.1 2003/07/15 07:58:28 bardtx Exp $ - */ #ifndef __KOS_NETCFG_H Modified: kos/addons/include/kos/pcx.h =================================================================== --- kos/addons/include/kos/pcx.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/include/kos/pcx.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/pcx.h (c)2000-2001 Dan Potter - $Id: pcx.h,v 1.2 2002/01/05 07:23:32 bardtx Exp $ - */ #ifndef __KOS_PCX_H Modified: kos/addons/include/kos/vector.h =================================================================== --- kos/addons/include/kos/vector.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/include/kos/vector.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/vector.h (c)2002 Dan Potter - $Id: vector.h,v 1.1 2002/09/05 07:31:55 bardtx Exp $ - */ #ifndef __KOS_VECTOR_H Modified: kos/addons/libkosutils/Makefile =================================================================== --- kos/addons/libkosutils/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/libkosutils/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -1,6 +1,5 @@ # libkosutils Makefile # -# $Id: Makefile,v 1.2 2003/02/27 04:25:40 bardtx Exp $ TARGET = libkosutils.a OBJS = bspline.o img.o pcx_small.o Modified: kos/addons/libkosutils/img.c =================================================================== --- kos/addons/libkosutils/img.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/libkosutils/img.c 2008-09-22 23:59:53 UTC (rev 611) @@ -10,8 +10,6 @@ #include <assert.h> #include <kos/img.h> -CVSID("$Id: img.c,v 1.2 2003/04/24 03:17:44 bardtx Exp $"); - /* Free a kos_img_t which was created by an image loader; set struct_also to non-zero if you want it to free the struct itself as well. */ void kos_img_free(kos_img_t *img, int struct_also) { Modified: kos/addons/libkosutils/pcx_small.c =================================================================== --- kos/addons/libkosutils/pcx_small.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/addons/libkosutils/pcx_small.c 2008-09-22 23:59:53 UTC (rev 611) @@ -6,15 +6,11 @@ PCX image loader */ -/* XXX This needs to go elsewhere... */ - #include <stdio.h> #include <arch/types.h> #include <kos/fs.h> #include <kos/pcx.h> -CVSID("$Id: pcx_small.c,v 1.2 2002/01/06 01:14:48 bardtx Exp $"); - /* PCX header structure */ typedef struct { char mfg; /* manufacturer, always 0xa0 */ Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/CHANGELOG 2008-09-22 23:59:53 UTC (rev 611) @@ -834,7 +834,3 @@ KallistiOS version 0.6 -------------------------------------------------- - First release - - -KOS Version Id: $Id: CHANGELOG,v 1.212.2.2 2003/08/02 01:51:55 bardtx Exp $ - Modified: kos/doc/FAQ =================================================================== --- kos/doc/FAQ 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/FAQ 2008-09-22 23:59:53 UTC (rev 611) @@ -404,7 +404,3 @@ --- End ------------------------------------------------------------ - -KOS Version Id: $Id: FAQ,v 1.5 2002/11/06 08:30:57 bardtx Exp $ - - Modified: kos/doc/LICENSE =================================================================== --- kos/doc/LICENSE 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/LICENSE 2008-09-22 23:59:53 UTC (rev 611) @@ -81,7 +81,3 @@ This software is based in part on the work of the Independent JPEG Group (see addons/libjpeg/README). - - -KOS Version Id: $Id: LICENSE,v 1.2 2002/04/20 03:23:57 bardtx Exp $ - Modified: kos/doc/README =================================================================== --- kos/doc/README 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/README 2008-09-22 23:59:53 UTC (rev 611) @@ -269,6 +269,3 @@ "PlayStation" is a registered trademark of Sony Computer Entertainment America "Intel" is a registered trademark of Intel, Inc. Any other trademarks are trademarks of their respective owners. - -KOS Version Id: $Id: README,v 1.12 2003/05/23 03:08:00 bardtx Exp $ - Modified: kos/doc/README.BSD =================================================================== --- kos/doc/README.BSD 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/README.BSD 2008-09-22 23:59:53 UTC (rev 611) @@ -7,9 +7,7 @@ Dan Potter -KOS Version Id: $Id: README.BSD,v 1.1.1.1 2001/09/26 07:05:00 bardtx Exp $ - # $FreeBSD: src/COPYRIGHT,v 1.4 1999/09/05 21:33:47 obrien Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 Modified: kos/doc/README.GPL =================================================================== --- kos/doc/README.GPL 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/README.GPL 2008-09-22 23:59:53 UTC (rev 611) @@ -21,10 +21,7 @@ Dan Potter -KOS Version Id: $Id: README.GPL,v 1.1.1.1 2001/09/26 07:05:00 bardtx Exp $ - - GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Modified: kos/doc/README.KOS =================================================================== --- kos/doc/README.KOS 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/README.KOS 2008-09-22 23:59:53 UTC (rev 611) @@ -25,11 +25,8 @@ derived source files and binary compilations; a credit in the documentation is ok) and there is no warranty. - Dan Potter + Dan Potter -KOS Version Id: $Id: README.KOS,v 1.2 2002/04/20 03:23:57 bardtx Exp $ - - All of the documentation and software included in the KallistiOS Releases is copyrighted (c)2000-2002 by Dan Potter and others (as noted in each file). Modified: kos/doc/RELNOTES =================================================================== --- kos/doc/RELNOTES 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/RELNOTES 2008-09-22 23:59:53 UTC (rev 611) @@ -276,7 +276,3 @@ building any C++ targets. Conversely, if you have a working G++, make sure you have a KOS_CCPLUS line so that all of the libraries and examples will get built. - - -KOS Version Id: $Id: RELNOTES,v 1.20 2003/05/23 03:08:00 bardtx Exp $ - Modified: kos/doc/coding_style.txt =================================================================== --- kos/doc/coding_style.txt 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/coding_style.txt 2008-09-22 23:59:53 UTC (rev 611) @@ -258,7 +258,6 @@ foobar.h (c)2002 Joe Sixpack Developer - $Id: coding_style.txt,v 1.1 2002/02/11 06:05:52 bardtx Exp $ */ @@ -342,15 +341,6 @@ #include <dc/net/broadband_adapter.h> #include <arch/types.h> -After that, you'll want a CVSID line. If you have included no other headers -then you'll need to manually include sys/cdefs.h, and then put a line much -like this: - -CVSID("$Id: coding_style.txt,v 1.1 2002/02/11 06:05:52 bardtx Exp $"); - -Later when this is checked in, it will expand to useful version info which -is placed in the object files. - After that, feel free to put a block comment explaining what's in the file and describing any notes about the module, if neccessary / warranted, followed by the functions/variables themselves. Modified: kos/doc/goals.txt =================================================================== --- kos/doc/goals.txt 2008-09-21 18:39:06 UTC (rev 610) +++ kos/doc/goals.txt 2008-09-22 23:59:53 UTC (rev 611) @@ -105,7 +105,3 @@ - Ethernet - Bitmaster bus device? * TCP/IP stack - - -KOS Version Id: $Id: goals.txt,v 1.1.1.1 2001/09/26 07:05:00 bardtx Exp $ - Modified: kos/examples/Makefile =================================================================== --- kos/examples/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/Makefile # (c)2001 Dan Potter -# -# $Id: Makefile,v 1.1.1.1 2001/09/26 07:05:13 bardtx Exp $ +# all: $(KOS_MAKE) -C $(KOS_ARCH) Modified: kos/examples/dreamcast/2ndmix/2ndmix.c =================================================================== --- kos/examples/dreamcast/2ndmix/2ndmix.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/2ndmix/2ndmix.c 2008-09-22 23:59:53 UTC (rev 611) @@ -19,9 +19,6 @@ #include <stdlib.h> #include <assert.h> -CVSID("$Id: 2ndmix.c,v 1.7 2002/09/05 07:49:38 bardtx Exp $"); - - /* Floating-point Sin/Cos; 256 angles, -1.0 to 1.0 */ #include "sintab.h" #define msin(angle) sintab[angle] Modified: kos/examples/dreamcast/2ndmix/Makefile =================================================================== --- kos/examples/dreamcast/2ndmix/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/2ndmix/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # 2ndmix/Makefile # Copyright (C)2003 Dan Potter -# -# $Id: Makefile,v 1.4 2002/04/20 04:24:19 axlen Exp $ +# all: rm-elf 2ndmix.elf Modified: kos/examples/dreamcast/Makefile =================================================================== --- kos/examples/dreamcast/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/Makefile # Copyright (C)2003 Dan Potter -# -# $Id: Makefile,v 1.17 2003/05/23 02:05:41 bardtx Exp $ +# DIRS = 2ndmix basic libdream kgl hello sound png network vmu conio pvr video lua parallax modem ifdef KOS_CCPLUS Modified: kos/examples/dreamcast/basic/Makefile =================================================================== --- kos/examples/dreamcast/basic/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/basic/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/basic/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.4 2002/10/08 07:51:20 bardtx Exp $ +# all: $(KOS_MAKE) -C exec Modified: kos/examples/dreamcast/basic/fpu/Makefile =================================================================== --- kos/examples/dreamcast/basic/fpu/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/basic/fpu/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/basic/fpu/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/05/18 07:08:35 bardtx Exp $ +# all: $(KOS_MAKE) -C exc Modified: kos/examples/dreamcast/basic/mmu/Makefile =================================================================== --- kos/examples/dreamcast/basic/mmu/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/basic/mmu/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/basic/mmu/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/10/08 07:51:21 bardtx Exp $ +# all: $(KOS_MAKE) -C pvrmap Modified: kos/examples/dreamcast/basic/threading/Makefile =================================================================== --- kos/examples/dreamcast/basic/threading/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/basic/threading/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/basic/threading/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/04/19 07:53:52 bardtx Exp $ +# all: $(KOS_MAKE) -C general Modified: kos/examples/dreamcast/basic/threading/general/Makefile =================================================================== --- kos/examples/dreamcast/basic/threading/general/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/basic/threading/general/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # basic/threading/Makefile # (c)2001 Dan Potter -# -# $Id: Makefile,v 1.3 2002/04/20 06:25:41 bardtx Exp $ +# all: rm-elf general_threading_test.elf Modified: kos/examples/dreamcast/conio/Makefile =================================================================== --- kos/examples/dreamcast/conio/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/conio/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/conio/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.4 2002/07/27 01:23:49 bardtx Exp $ +# all: $(KOS_MAKE) -C basic Modified: kos/examples/dreamcast/conio/adventure/Makefile =================================================================== --- kos/examples/dreamcast/conio/adventure/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/conio/adventure/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # conio/adventure/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.3 2002/06/11 06:55:17 bardtx Exp $ +# all: rm-elf adventure.elf Modified: kos/examples/dreamcast/conio/basic/Makefile =================================================================== --- kos/examples/dreamcast/conio/basic/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/conio/basic/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # conio/basic/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/04/20 19:21:49 bardtx Exp $ +# all: rm-elf basic.elf Modified: kos/examples/dreamcast/conio/wump/Makefile =================================================================== --- kos/examples/dreamcast/conio/wump/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/conio/wump/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # conio/wump/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/04/20 19:49:40 bardtx Exp $ +# all: rm-elf wump.elf Modified: kos/examples/dreamcast/cpp/Makefile =================================================================== --- kos/examples/dreamcast/cpp/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/cpp/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/cpp/Makefile # (c)2001-2002 Dan Potter -# -# $Id: Makefile,v 1.3 2002/02/24 02:13:07 bardtx Exp $ +# all: $(KOS_MAKE) -C gltest Modified: kos/examples/dreamcast/kgl/Makefile =================================================================== --- kos/examples/dreamcast/kgl/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/kgl/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.3 2002/04/20 03:48:55 axlen Exp $ +# all: $(KOS_MAKE) -C basic Modified: kos/examples/dreamcast/kgl/basic/Makefile =================================================================== --- kos/examples/dreamcast/kgl/basic/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/basic/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -4,8 +4,6 @@ # # (c)2002 Paul Boese # -# $Id: Makefile,v 1.6 2002/12/09 04:52:17 bardtx Exp $ -# # This will make all the examples, leaving only the elf files. # If you want to clean everything, use 'clean'. Modified: kos/examples/dreamcast/kgl/basic/scissor/Makefile =================================================================== --- kos/examples/dreamcast/kgl/basic/scissor/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/basic/scissor/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -4,7 +4,6 @@ # scissor test # (c)2002 Paul Boese # -# $Id: Makefile,v 1.4 2002/09/05 07:40:47 bardtx Exp $ TARGET = scissor.elf OBJS = scissor.o Modified: kos/examples/dreamcast/kgl/basic/scissor/scissor.c =================================================================== --- kos/examples/dreamcast/kgl/basic/scissor/scissor.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/basic/scissor/scissor.c 2008-09-22 23:59:53 UTC (rev 611) @@ -22,8 +22,6 @@ #include <GL/glu.h> #include <pcx/pcx.h> -CVSID("$Id: scissor.c,v 1.4 2002/06/30 16:28:34 axlen Exp $"); - #define NUM_DEMOS 5 enum { USERCLIP_INSIDE = 0, USERCLIP_OUTSIDE, USERCLIP_DISABLED, QUAD_SCREEN_UNCLIPPED, QUAD_SCREEN_CLIPPED }; Modified: kos/examples/dreamcast/kgl/basic/texwrap/Makefile =================================================================== --- kos/examples/dreamcast/kgl/basic/texwrap/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/basic/texwrap/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -4,7 +4,6 @@ # texwrap test # (c)2002 Paul Boese # -# $Id: Makefile,v 1.4 2002/09/05 07:40:47 bardtx Exp $ TARGET = texwrap.elf OBJS = texwrap.o Modified: kos/examples/dreamcast/kgl/basic/texwrap/texwrap.c =================================================================== --- kos/examples/dreamcast/kgl/basic/texwrap/texwrap.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/basic/texwrap/texwrap.c 2008-09-22 23:59:53 UTC (rev 611) @@ -9,8 +9,6 @@ #include <GL/glu.h> #include <pcx/pcx.h> -CVSID("$Id: texwrap.c,v 1.2 2002/04/07 02:54:04 bardtx Exp $"); - /* Really simple KGL example to demonstrate the glTexParameter texture wrapping modes. Modified: kos/examples/dreamcast/kgl/basic/vfzclip/Makefile =================================================================== --- kos/examples/dreamcast/kgl/basic/vfzclip/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/basic/vfzclip/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -1,8 +1,6 @@ # # KallistiGL View Frustum Z-Clipping Test Program # (c)2002 Paul Boese -# -# $Id # TARGET = vfzclip.elf Modified: kos/examples/dreamcast/kgl/basic/vfzclip/vfzclip.c =================================================================== --- kos/examples/dreamcast/kgl/basic/vfzclip/vfzclip.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/basic/vfzclip/vfzclip.c 2008-09-22 23:59:53 UTC (rev 611) @@ -14,8 +14,6 @@ #define true (1 == 1) #define false (1 == 0) -CVSID("$Id"); - /* A demonstration of Trilinear's NEAR-Z-Clipper that has been incorporated into KGL. Use the joystick to rotate the view, the D-Pad Modified: kos/examples/dreamcast/kgl/benchmarks/Makefile =================================================================== --- kos/examples/dreamcast/kgl/benchmarks/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/benchmarks/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/kgl/benchmarks/Makefile # (c)2001-2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/04/20 03:51:45 axlen Exp $ +# all: $(KOS_MAKE) -C quadmark Modified: kos/examples/dreamcast/kgl/benchmarks/quadmark/quadmark.c =================================================================== --- kos/examples/dreamcast/kgl/benchmarks/quadmark/quadmark.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/benchmarks/quadmark/quadmark.c 2008-09-22 23:59:53 UTC (rev 611) @@ -8,8 +8,6 @@ #include <GL/gl.h> #include <time.h> -CVSID("$Id: quadmark.c,v 1.3 2003/03/09 01:20:06 bardtx Exp $"); - pvr_init_params_t pvr_params = { { PVR_BINSIZE_16, PVR_BINSIZE_0, PVR_BINSIZE_0, PVR_BINSIZE_0, PVR_BINSIZE_0 }, 512 * 1024 Modified: kos/examples/dreamcast/kgl/benchmarks/trimark/trimark.c =================================================================== --- kos/examples/dreamcast/kgl/benchmarks/trimark/trimark.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/benchmarks/trimark/trimark.c 2008-09-22 23:59:53 UTC (rev 611) @@ -8,8 +8,6 @@ #include <GL/gl.h> #include <time.h> -CVSID("$Id: trimark.c,v 1.3 2003/03/09 01:20:06 bardtx Exp $"); - pvr_init_params_t pvr_params = { { PVR_BINSIZE_16, PVR_BINSIZE_0, PVR_BINSIZE_0, PVR_BINSIZE_0, PVR_BINSIZE_0 }, 512 * 1024 Modified: kos/examples/dreamcast/kgl/demos/Makefile =================================================================== --- kos/examples/dreamcast/kgl/demos/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/demos/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/kgl/demos/Makefile # (c)2001-2002 Dan Potter -# -# $Id: Makefile,v 1.2 2002/03/04 05:00:45 bardtx Exp $ +# all: ifdef KOS_CCPLUS Modified: kos/examples/dreamcast/kgl/demos/tunnel/Makefile =================================================================== --- kos/examples/dreamcast/kgl/demos/tunnel/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/demos/tunnel/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -1,8 +1,6 @@ # KallistiOS ##version## # # tunnel Makefile -# -# $Id: Makefile,v 1.4 2002/09/05 07:40:48 bardtx Exp $ # TARGET = tunnel.elf Modified: kos/examples/dreamcast/kgl/demos/tunnel/menu.cpp =================================================================== --- kos/examples/dreamcast/kgl/demos/tunnel/menu.cpp 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/demos/tunnel/menu.cpp 2008-09-22 23:59:53 UTC (rev 611) @@ -13,8 +13,6 @@ #include "plprint.h" #include "menu.h" -CVSID("$Id: menu.cpp,v 1.1 2002/03/04 02:57:32 axlen Exp $"); - void Menu::add(int min, int max, int amt, int* pval, char *pformat) { Menuitem_t* madd; if (mlist == NULL) { Modified: kos/examples/dreamcast/kgl/demos/tunnel/menu.h =================================================================== --- kos/examples/dreamcast/kgl/demos/tunnel/menu.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/demos/tunnel/menu.h 2008-09-22 23:59:53 UTC (rev 611) @@ -5,7 +5,6 @@ A cheap little menu class - $Id: menu.h,v 1.1 2002/03/04 02:57:32 axlen Exp $ */ #ifndef __MENU_H Modified: kos/examples/dreamcast/kgl/demos/tunnel/plprint.cpp =================================================================== --- kos/examples/dreamcast/kgl/demos/tunnel/plprint.cpp 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/demos/tunnel/plprint.cpp 2008-09-22 23:59:53 UTC (rev 611) @@ -11,8 +11,6 @@ #include <dcplib/fnt.h> #include "plprint.h" -CVSID("$Id: plprint.cpp,v 1.2 2002/04/12 01:05:12 axlen Exp $"); - extern uint8 romdisk[]; static fntRenderer *text; Modified: kos/examples/dreamcast/kgl/demos/tunnel/plprint.h =================================================================== --- kos/examples/dreamcast/kgl/demos/tunnel/plprint.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/demos/tunnel/plprint.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,7 +3,6 @@ plprint.h (c)2002 Paul Boese - $Id: plprint.h,v 1.1 2002/03/04 02:57:32 axlen Exp $ */ #ifndef __PLPRINT_H Modified: kos/examples/dreamcast/kgl/demos/tunnel/tunnel.cpp =================================================================== --- kos/examples/dreamcast/kgl/demos/tunnel/tunnel.cpp 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/demos/tunnel/tunnel.cpp 2008-09-22 23:59:53 UTC (rev 611) @@ -12,8 +12,6 @@ #include "plprint.h" #include "menu.h" -CVSID("$Id: tunnel.cpp,v 1.7 2003/03/09 01:20:06 bardtx Exp $"); - #define DPAD_REPEAT_INTERVAL 7 /* frames */ /* tunnel */ Modified: kos/examples/dreamcast/kgl/nehe/Makefile =================================================================== --- kos/examples/dreamcast/kgl/nehe/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/nehe/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ # examples/dreamcast/kgl/nehe/Makefile # (c)2002 Paul Boese # -# $Id: Makefile,v 1.1 2002/02/23 05:31:52 axlen Exp $ -# # This will make all the examples, leaving only the elf files. # If you want to clean everything, use 'clean'. Modified: kos/examples/dreamcast/kgl/nehe/nehe26/data/Makefile =================================================================== --- kos/examples/dreamcast/kgl/nehe/nehe26/data/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/kgl/nehe/nehe26/data/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,7 +2,6 @@ # # (c)2002, Paul Boese # -# $Id: Makefile,v 1.1 2002/02/23 05:20:36 axlen Exp $ CC = gcc -Wall Modified: kos/examples/dreamcast/lua/Makefile =================================================================== --- kos/examples/dreamcast/lua/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/lua/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/lua/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/06/13 09:51:16 bardtx Exp $ +# all: $(KOS_MAKE) -C basic Modified: kos/examples/dreamcast/lua/basic/Makefile =================================================================== --- kos/examples/dreamcast/lua/basic/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/lua/basic/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # lua/basic/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.2 2002/06/30 06:33:38 bardtx Exp $ +# all: rm-elf lua.elf Modified: kos/examples/dreamcast/lua/basic/lua.c =================================================================== --- kos/examples/dreamcast/lua/basic/lua.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/lua/basic/lua.c 2008-09-22 23:59:53 UTC (rev 611) @@ -1,5 +1,4 @@ /* -** $Id: lua.c,v 1.2 2002/06/30 06:33:38 bardtx Exp $ ** Lua stand-alone interpreter ** See Copyright Notice in lua.h */ Modified: kos/examples/dreamcast/modem/Makefile =================================================================== --- kos/examples/dreamcast/modem/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/modem/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/modem/Makefile # Copyright (C)2003 Dan Potter -# -# $Id: Makefile,v 1.1 2003/05/23 02:05:41 bardtx Exp $ +# all: $(KOS_MAKE) -C basic Modified: kos/examples/dreamcast/network/Makefile =================================================================== --- kos/examples/dreamcast/network/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/network/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/network/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.5 2002/06/11 06:14:39 bardtx Exp $ +# all: $(KOS_MAKE) -C basic Modified: kos/examples/dreamcast/network/httpd/httpd.c =================================================================== --- kos/examples/dreamcast/network/httpd/httpd.c 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/network/httpd/httpd.c 2008-09-22 23:59:53 UTC (rev 611) @@ -8,8 +8,6 @@ #include <lwip/lwip.h> #include <lwip/sockets.h> #include <sys/queue.h> - -CVSID("$Id: httpd.c,v 1.3 2003/07/22 03:57:57 bardtx Exp $"); struct http_state; typedef TAILQ_HEAD(http_state_list, http_state) http_state_list_t; Modified: kos/examples/dreamcast/parallax/Makefile =================================================================== --- kos/examples/dreamcast/parallax/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/parallax/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/parallax/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.2 2002/09/10 04:40:10 bardtx Exp $ +# TARGETS = font bubbles raster_melt sinus delay_cube rotocube Modified: kos/examples/dreamcast/pvr/Makefile =================================================================== --- kos/examples/dreamcast/pvr/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/pvr/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/pvr/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.2 2002/09/28 04:18:55 bardtx Exp $ +# all: $(KOS_MAKE) -C plasma Modified: kos/examples/dreamcast/sound/Makefile =================================================================== --- kos/examples/dreamcast/sound/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/sound/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/sound/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.2.2.1 2003/06/20 06:31:15 bardtx Exp $ +# all: $(KOS_MAKE) -C ghettoplay-vorbis Modified: kos/examples/dreamcast/sound/cdda/Makefile =================================================================== --- kos/examples/dreamcast/sound/cdda/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/sound/cdda/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/sound/cdda/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.2 2002/07/17 15:14:16 axlen Exp $ +# all: $(KOS_MAKE) -C basic_cdda Modified: kos/examples/dreamcast/tsunami/Makefile =================================================================== --- kos/examples/dreamcast/tsunami/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/tsunami/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/tsunami/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1.2.1 2003/06/20 06:10:25 bardtx Exp $ +# all: $(KOS_MAKE) -C font Modified: kos/examples/dreamcast/video/Makefile =================================================================== --- kos/examples/dreamcast/video/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/video/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/video/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/07/10 16:51:42 bardtx Exp $ +# all: $(KOS_MAKE) -C bfont Modified: kos/examples/dreamcast/video/bfont/Makefile =================================================================== --- kos/examples/dreamcast/video/bfont/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/video/bfont/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # basic/bfont/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/06/27 23:23:09 bardtx Exp $ +# all: rm-elf bfont.elf Modified: kos/examples/dreamcast/vmu/Makefile =================================================================== --- kos/examples/dreamcast/vmu/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/dreamcast/vmu/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/dreamcast/vmu/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/02/24 06:20:12 bardtx Exp $ +# all: $(KOS_MAKE) -C vmu_pkg Modified: kos/examples/gba/Makefile =================================================================== --- kos/examples/gba/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/gba/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/gba/Makefile # (c)2001 Dan Potter -# -# $Id: Makefile,v 1.2 2002/09/23 23:35:40 bardtx Exp $ +# all: $(KOS_MAKE) -C pogo-keen Modified: kos/examples/gba/pogo-keen/Makefile =================================================================== --- kos/examples/gba/pogo-keen/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/gba/pogo-keen/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # pogo-keen/Makefile # (c)2002 Gil Megidish -# -# $Id: Makefile,v 1.1 2002/09/23 19:30:27 gilm Exp $ +# all: pogo-keen.gba Modified: kos/examples/ps2/Makefile =================================================================== --- kos/examples/ps2/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/ps2/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/ps2/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/10/27 23:41:13 bardtx Exp $ +# all: $(KOS_MAKE) -C basic Modified: kos/examples/ps2/basic/Makefile =================================================================== --- kos/examples/ps2/basic/Makefile 2008-09-21 18:39:06 UTC (rev 610) +++ kos/examples/ps2/basic/Makefile 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,7 @@ # # examples/ps2/basic/Makefile # (c)2002 Dan Potter -# -# $Id: Makefile,v 1.1 2002/10/27 23:41:13 bardtx Exp $ +# all: $(KOS_MAKE) -C hello Modified: kos/include/assert.h =================================================================== --- kos/include/assert.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/assert.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,7 +3,6 @@ assert.h Copyright (C)2002,2004 Dan Potter - $Id: assert.h,v 1.2 2002/09/13 04:41:57 bardtx Exp $ */ #ifndef __ASSERT_H Modified: kos/include/endian.h =================================================================== --- kos/include/endian.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/endian.h 2008-09-22 23:59:53 UTC (rev 611) @@ -2,7 +2,6 @@ * This module was ported from the BSD 4.5 libc by Dan Potter. Please * see "README.BSD" in "docs" for more information. * - * $Id: endian.h,v 1.2 2003/04/24 03:18:08 bardtx Exp $ */ /* Modified: kos/include/kos/cdefs.h =================================================================== --- kos/include/kos/cdefs.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/cdefs.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/cdefs.h Copyright (C)2002,2004 Dan Potter - $Id: cdefs.h,v 1.2 2002/10/26 08:01:34 bardtx Exp $ - Based loosely around some stuff in BSD's sys/cdefs.h */ @@ -42,20 +40,6 @@ /* GCC macros for special cases */ /* #if __GNUC__ == */ -/* Optional CVS ID tags, without warnings */ -#if defined(__GNUC__) && defined(__ELF__) -# define __IDSTRING(name, string) __asm__(".ident\t\"" string "\"") -#else -# define __IDSTRING(name, string) static const char name[] __unused = string; -#endif - -#ifndef NO_CVS_ID -# define IDSTRING(name, s) __IDSTRING(name, s) -# define CVSID(s) __IDSTRING(cvsid, "KOS " s) -#else -# define IDSTRING(s) -#endif - #endif /* __KOS_CDEFS_H */ Modified: kos/include/kos/cond.h =================================================================== --- kos/include/kos/cond.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/cond.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ include/kos/cond.h Copyright (C)2001,2003 Dan Potter - $Id: cond.h,v 1.4 2003/07/31 00:38:00 bardtx Exp $ - */ #ifndef __KOS_COND_H Modified: kos/include/kos/dbgio.h =================================================================== --- kos/include/kos/dbgio.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/dbgio.h 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,6 @@ kos/include/dbgio.h Copyright (C)2000,2004 Dan Potter - - $Id: dbgio.h,v 1.4 2002/04/06 23:40:32 bardtx Exp $ */ Modified: kos/include/kos/dbglog.h =================================================================== --- kos/include/kos/dbglog.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/dbglog.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/dbglog.h Copyright (C)2004 Dan Potter - $Id: stdio.h,v 1.3 2003/06/23 05:21:31 bardtx Exp $ - */ #ifndef __KOS_DBGLOG_H Modified: kos/include/kos/elf.h =================================================================== --- kos/include/kos/elf.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/elf.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/elf.h Copyright (C)2000,2001,2003 Dan Potter - $Id: elf.h,v 1.3 2003/08/02 23:08:36 bardtx Exp $ - */ #ifndef __KOS_ELF_H Modified: kos/include/kos/exports.h =================================================================== --- kos/include/kos/exports.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/exports.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/exports.h Copyright (C)2003 Dan Potter - $Id: exports.h,v 1.1 2003/06/19 04:30:23 bardtx Exp $ - */ #ifndef __KOS_EXPORTS_H Modified: kos/include/kos/fs.h =================================================================== --- kos/include/kos/fs.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/fs.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/fs.h Copyright (C)2000,2001,2002,2003 Dan Potter - $Id: fs.h,v 1.11 2003/07/31 00:38:00 bardtx Exp $ - */ #ifndef __KOS_FS_H Modified: kos/include/kos/fs_builtin.h =================================================================== --- kos/include/kos/fs_builtin.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/fs_builtin.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,7 +3,6 @@ kos/fs_builtin.h (c)2000-2001 Dan Potter - $Id: fs_builtin.h,v 1.3 2002/08/12 18:43:53 bardtx Exp $ */ #ifndef __KOS_FS_BUILTIN_H Modified: kos/include/kos/fs_pty.h =================================================================== --- kos/include/kos/fs_pty.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/fs_pty.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,7 +3,6 @@ kos/fs_pty.h Copyright (C)2003 Dan Potter - $Id: fs_pty.h,v 1.1 2003/06/19 04:30:23 bardtx Exp $ */ #ifndef __KOS_FS_PTY_H Modified: kos/include/kos/fs_ramdisk.h =================================================================== --- kos/include/kos/fs_ramdisk.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/fs_ramdisk.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,7 +3,6 @@ kos/fs_ramdisk.h (c)2002 Dan Potter - $Id: fs_ramdisk.h,v 1.2 2003/04/24 03:00:02 bardtx Exp $ */ #ifndef __KOS_FS_RAMDISK_H Modified: kos/include/kos/fs_romdisk.h =================================================================== --- kos/include/kos/fs_romdisk.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/fs_romdisk.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,7 +3,6 @@ kos/fs_romdisk.h (c)2001 Dan Potter - $Id: fs_romdisk.h,v 1.4 2002/08/13 04:54:22 bardtx Exp $ */ #ifndef __KOS_FS_ROMDISK_H Modified: kos/include/kos/genwait.h =================================================================== --- kos/include/kos/genwait.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/genwait.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ include/kos/genwait.h Copyright (c)2003 Dan Potter - $Id: genwait.h,v 1.2 2003/02/16 04:55:24 bardtx Exp $ - */ #ifndef __KOS_GENWAIT_H Modified: kos/include/kos/iovec.h =================================================================== --- kos/include/kos/iovec.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/iovec.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/iovec.h Copyright (C)2001 Dan Potter - $Id: iovec.h,v 1.1 2002/02/09 06:15:42 bardtx Exp $ - */ #ifndef __KOS_IOVEC_H Modified: kos/include/kos/library.h =================================================================== --- kos/include/kos/library.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/library.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ include/kos/library.h Copyright (C)2003 Dan Potter - $Id$ - */ #ifndef __KOS_LIBRARY_H Modified: kos/include/kos/limits.h =================================================================== --- kos/include/kos/limits.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/limits.h 2008-09-22 23:59:53 UTC (rev 611) @@ -2,8 +2,6 @@ kos/limits.h (c)2000-2001 Dan Potter - - $Id: limits.h,v 1.1.1.1 2001/09/26 07:05:20 bardtx Exp $ */ Modified: kos/include/kos/mutex.h =================================================================== --- kos/include/kos/mutex.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/mutex.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ include/kos/mutex.h Copyright (C)2001,2003 Dan Potter - $Id: mutex.h,v 1.2 2003/07/31 00:38:00 bardtx Exp $ - */ #ifndef __KOS_MUTEX_H Modified: kos/include/kos/net.h =================================================================== --- kos/include/kos/net.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/net.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ include/kos/net.h (c)2002 Dan Potter - $Id: net.h,v 1.8 2003/06/19 04:30:23 bardtx Exp $ - */ #ifndef __KOS_NET_H Modified: kos/include/kos/nmmgr.h =================================================================== --- kos/include/kos/nmmgr.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/nmmgr.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ kos/nmmgr.h Copyright (C)2003 Dan Potter - $Id: nmmgr.h,v 1.1 2003/06/19 04:30:23 bardtx Exp $ - */ #ifndef __KOS_NMMGR_H Modified: kos/include/kos/sem.h =================================================================== --- kos/include/kos/sem.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/sem.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ include/kos/sem.h Copyright (C)2001,2003 Dan Potter - $Id: sem.h,v 1.7 2003/07/31 00:38:00 bardtx Exp $ - */ #ifndef __KOS_SEM_H Modified: kos/include/kos/thread.h =================================================================== --- kos/include/kos/thread.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos/thread.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ include/kos/thread.h Copyright (C)2000,2001,2002,2003 Dan Potter - $Id: thread.h,v 1.13 2003/06/23 05:19:50 bardtx Exp $ - */ #ifndef __KOS_THREAD_H Modified: kos/include/kos.h =================================================================== --- kos/include/kos.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/kos.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,7 +3,6 @@ kos.h (c)2001 Dan Potter - $Id: kos.h,v 1.25 2003/05/23 02:18:45 bardtx Exp $ */ #ifndef __KOS_H Modified: kos/include/malloc.h =================================================================== --- kos/include/malloc.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/malloc.h 2008-09-22 23:59:53 UTC (rev 611) @@ -3,8 +3,6 @@ malloc.h Copyright (C)2003 Dan Potter - $Id: malloc.h,v 1.6 2003/06/19 04:31:26 bardtx Exp $ - */ #ifndef __MALLOC_H Modified: kos/include/pthread.h =================================================================== --- kos/include/pthread.h 2008-09-21 18:39:06 UTC (rev 610) +++ kos/include/pthread.h 2008-09-22 23:59:53 UTC (rev 611) @@ -15,7 +15,6 @@ * OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS * SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. * - * $Id: pthread.h,v 1.3 2002/10/08 13:03:07 joel Exp $ */ // Need a local copy of this because the default one is buggy. Modified: kos/kernel/Makefile =================================================================== --- kos/ke... [truncated message content] |
From: <ljs...@us...> - 2008-09-21 18:39:11
|
Revision: 610 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=610&view=rev Author: ljsebald Date: 2008-09-21 18:39:06 +0000 (Sun, 21 Sep 2008) Log Message: ----------- Adding in an implementation of DHCP to the network stack. Modified Paths: -------------- kos/doc/CHANGELOG kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c kos/kernel/net/Makefile kos/kernel/net/net_core.c Added Paths: ----------- kos/kernel/net/net_dhcp.c kos/kernel/net/net_dhcp.h Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-09-17 16:10:14 UTC (rev 609) +++ kos/doc/CHANGELOG 2008-09-21 18:39:06 UTC (rev 610) @@ -176,6 +176,7 @@ between PlanetWeb and DreamPassport [LS] - DC Added reading of the ISP settings from PlanetWeb to the flashrom code [LS] - DC Fixed various pieces of code that rely on flashrom_ispcfg_t [LS] +- *** Added an implementation of DHCP to the network stack [LS] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c 2008-09-17 16:10:14 UTC (rev 609) +++ kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c 2008-09-21 18:39:06 UTC (rev 610) @@ -1044,8 +1044,9 @@ bba_if.flags = NETIF_NO_FLAGS; bba_get_mac(bba_if.mac_addr); memset(bba_if.ip_addr, 0, sizeof(bba_if.ip_addr)); - memset(bba_if.netmask, 0, sizeof(bba_if.netmask)); - memset(bba_if.gateway, 0, sizeof(bba_if.gateway)); + memset(bba_if.netmask, 0, sizeof(bba_if.netmask)); + memset(bba_if.gateway, 0, sizeof(bba_if.gateway)); + memset(bba_if.broadcast, 0, sizeof(bba_if.broadcast)); bba_if.if_detect = bba_if_detect; bba_if.if_init = bba_if_init; bba_if.if_shutdown = bba_if_shutdown; Modified: kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c 2008-09-17 16:10:14 UTC (rev 609) +++ kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c 2008-09-21 18:39:06 UTC (rev 610) @@ -668,6 +668,7 @@ memset(la_if.ip_addr, 0, sizeof(la_if.ip_addr)); memset(la_if.netmask, 0, sizeof(la_if.netmask)); memset(la_if.gateway, 0, sizeof(la_if.gateway)); + memset(la_if.broadcast, 0, sizeof(la_if.broadcast)); la_if.if_detect = la_if_detect; la_if.if_init = la_if_init; la_if.if_shutdown = la_if_shutdown; Modified: kos/kernel/net/Makefile =================================================================== --- kos/kernel/net/Makefile 2008-09-17 16:10:14 UTC (rev 609) +++ kos/kernel/net/Makefile 2008-09-21 18:39:06 UTC (rev 610) @@ -5,7 +5,7 @@ # # $Id: Makefile,v 1.2 2002/02/10 20:31:43 bardtx Exp $ -OBJS = net_core.o net_arp.o net_input.o net_icmp.o net_ipv4.o net_udp.o +OBJS = net_core.o net_arp.o net_input.o net_icmp.o net_ipv4.o net_udp.o net_dhcp.o SUBDIRS = include $(KOS_BASE)/Makefile.prefab Modified: kos/kernel/net/net_core.c =================================================================== --- kos/kernel/net/net_core.c 2008-09-17 16:10:14 UTC (rev 609) +++ kos/kernel/net/net_core.c 2008-09-21 18:39:06 UTC (rev 610) @@ -12,7 +12,7 @@ #include <kos/net.h> #include <kos/fs_socket.h> -CVSID("$Id: net_core.c,v 1.5 2002/10/26 07:59:50 bardtx Exp $"); +#include "net_dhcp.h" /* @@ -151,6 +151,13 @@ /* Initialize the sockets-like interface */ fs_socket_init(); + /* Initialize the DHCP system */ + net_dhcp_init(); + + if(net_default_dev && !net_default_dev->ip_addr[0]) { + return net_dhcp_request(); + } + return 0; } @@ -158,6 +165,9 @@ void net_shutdown() { netif_t *cur; + /* Shut down DHCP */ + net_dhcp_shutdown(); + /* Shut down the sockets-like interface */ fs_socket_shutdown(); Added: kos/kernel/net/net_dhcp.c =================================================================== --- kos/kernel/net/net_dhcp.c (rev 0) +++ kos/kernel/net/net_dhcp.c 2008-09-21 18:39:06 UTC (rev 610) @@ -0,0 +1,652 @@ +/* KallistiOS ##version## + + kernel/net/net_dhcp.c + Copyright (C) 2008 Lawrence Sebald + +*/ + +#include <sys/types.h> +#include <sys/queue.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#include <netinet/in.h> + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <time.h> + +#include <kos/net.h> +#include <kos/thread.h> +#include <kos/genwait.h> +#include <kos/recursive_lock.h> +#include <kos/fs_socket.h> + +#include <arch/timer.h> + +#include "net_dhcp.h" + +#define DHCP_SERVER_PORT 67 +#define DHCP_CLIENT_PORT 68 + +static int dhcp_sock = -1; +struct sockaddr_in srv_addr; + +struct dhcp_pkt_out { + STAILQ_ENTRY(dhcp_pkt_out) pkt_queue; + uint8 *buf; + int size; + int pkt_type; + int next_delay; + uint64 next_send; +}; + +STAILQ_HEAD(dhcp_pkt_queue, dhcp_pkt_out); + +static struct dhcp_pkt_queue dhcp_pkts = STAILQ_HEAD_INITIALIZER(dhcp_pkts); +static recursive_lock_t *dhcp_lock = NULL; +static kthread_t *dhcp_thd = NULL; +static uint64 renew_time = 0xFFFFFFFFFFFFFFFFULL; +static uint64 rebind_time = 0xFFFFFFFFFFFFFFFFULL; +static uint64 lease_expires = 0xFFFFFFFFFFFFFFFFULL; +static int state = DHCP_STATE_INIT; + +static int net_dhcp_fill_options(netif_t *net, dhcp_pkt_t *req, uint8 msgtype, + uint32 serverid, uint32 reqip) { + int pos = 0; + + /* DHCP Magic Cookie */ + req->options[pos++] = 0x63; + req->options[pos++] = 0x82; + req->options[pos++] = 0x53; + req->options[pos++] = 0x63; + + /* Message Type: DHCPDISCOVER */ + req->options[pos++] = DHCP_OPTION_MESSAGE_TYPE; + req->options[pos++] = 1; /* Length = 1 */ + req->options[pos++] = msgtype; + + req->options[pos++] = DHCP_OPTION_PAD; /* Pad for alignment */ + + /* Max Message Length: 1024 octets */ + req->options[pos++] = DHCP_OPTION_MAX_MESSAGE; + req->options[pos++] = 2; /* Length = 2 */ + *((uint16 *)(req->options + pos)) = htons(1024); + pos += 2; + + /* Host Name: Dreamcast */ + req->options[pos++] = DHCP_OPTION_HOST_NAME; + req->options[pos++] = 10; /* Length = 10 */ + strcpy(req->options + pos, "KallistiOS"); + pos += 10; + + /* Client Identifier: The network adapter's MAC address */ + req->options[pos++] = DHCP_OPTION_CLIENT_ID; + req->options[pos++] = 1 + DHCP_HLEN_ETHERNET; /* Length = 7 */ + req->options[pos++] = DHCP_HTYPE_10MB_ETHERNET; + memcpy(req->options + pos, net->mac_addr, DHCP_HLEN_ETHERNET); + pos += DHCP_HLEN_ETHERNET; + + req->options[pos++] = DHCP_OPTION_PAD; /* Pad for alignment */ + req->options[pos++] = DHCP_OPTION_PAD; + req->options[pos++] = DHCP_OPTION_PAD; + + /* Parameters requested: Subnet, Router, DNS, Broadcast */ + req->options[pos++] = DHCP_OPTION_PARAMETER_REQUEST; + req->options[pos++] = 4; /* Length = 4 */ + req->options[pos++] = DHCP_OPTION_SUBNET_MASK; + req->options[pos++] = DHCP_OPTION_ROUTER; + req->options[pos++] = DHCP_OPTION_DOMAIN_NAME_SERVER; + req->options[pos++] = DHCP_OPTION_BROADCAST_ADDR; + + if(serverid) { + /* Add the Server identifier option */ + req->options[pos++] = DHCP_OPTION_SERVER_ID; + req->options[pos++] = 4; /* Length = 4 */ + req->options[pos++] = (serverid >> 24) & 0xFF; + req->options[pos++] = (serverid >> 16) & 0xFF; + req->options[pos++] = (serverid >> 8) & 0xFF; + req->options[pos++] = (serverid >> 0) & 0xFF; + } + + if(reqip) { + /* Add the requested IP address option */ + req->options[pos++] = DHCP_OPTION_REQ_IP_ADDR; + req->options[pos++] = 4; /* Length = 4 */ + req->options[pos++] = (reqip >> 24) & 0xFF; + req->options[pos++] = (reqip >> 16) & 0xFF; + req->options[pos++] = (reqip >> 8) & 0xFF; + req->options[pos++] = (reqip >> 0) & 0xFF; + } + + /* Pad so that we have an even number of octets */ + req->options[pos++] = DHCP_OPTION_PAD; + + /* The End */ + req->options[pos++] = DHCP_OPTION_END; + + return pos; +} + +static int net_dhcp_get_message_type(dhcp_pkt_t *pkt, int len) { + int i; + + len -= sizeof(dhcp_pkt_t); + + /* Read each byte of the options field looking for the message type option. + when we find it, return the message type. */ + for(i = 4; i < len;) { + if(pkt->options[i] == DHCP_OPTION_MESSAGE_TYPE) { + return pkt->options[i + 2]; + } + else if(pkt->options[i] == DHCP_OPTION_PAD || + pkt->options[i] == DHCP_OPTION_END) { + ++i; + } + else { + i += pkt->options[i + 1]; + } + } + + return -1; +} + +static uint32 net_dhcp_get_32bit(dhcp_pkt_t *pkt, uint8 opt, int len) { + int i; + + len -= sizeof(dhcp_pkt_t); + + /* Read each byte of the options field looking for the specified option, + return it when found. */ + for(i = 4; i < len;) { + if(pkt->options[i] == opt) { + return (pkt->options[i + 2] << 24) | (pkt->options[i + 3] << 16) | + (pkt->options[i + 4] << 8) | (pkt->options[i + 5]); + } + else if(pkt->options[i] == DHCP_OPTION_PAD || + pkt->options[i] == DHCP_OPTION_END) { + ++i; + } + else { + i += pkt->options[i + 1]; + } + } + + return 0; +} + +int net_dhcp_request() { + uint8 pkt[1024]; + dhcp_pkt_t *req = (dhcp_pkt_t *)pkt; + int optlen; + struct dhcp_pkt_out *qpkt; + uint32 old; + int rv = 0; + + if(dhcp_sock == -1) { + return -1; + } + + if(!irq_inside_int()) { + rlock_lock(dhcp_lock); + } + else { + if(rlock_trylock(dhcp_lock)) { + return -1; + } + } + + /* Fill in the initial DHCPDISCOVER packet */ + req->op = DHCP_OP_BOOTREQUEST; + req->htype = DHCP_HTYPE_10MB_ETHERNET; + req->hlen = DHCP_HLEN_ETHERNET; + req->hops = 0; + req->xid = htonl(time(NULL) ^ 0xDEADBEEF); + req->secs = 0; + req->flags = 0; + req->ciaddr = 0; + req->yiaddr = 0; + req->siaddr = 0; + req->giaddr = 0; + memcpy(req->chaddr, net_default_dev->mac_addr, DHCP_HLEN_ETHERNET); + memset(req->chaddr + DHCP_HLEN_ETHERNET, 0, sizeof(req->chaddr) - + DHCP_HLEN_ETHERNET); + memset(req->sname, 0, sizeof(req->sname)); + memset(req->file, 0, sizeof(req->file)); + + /* Fill in options */ + optlen = net_dhcp_fill_options(net_default_dev, req, DHCP_MSG_DHCPDISCOVER, + 0, 0); + + /* Add to our packet queue */ + qpkt = (struct dhcp_pkt_out *)malloc(sizeof(struct dhcp_pkt_out)); + + if(!qpkt) { + rlock_unlock(dhcp_lock); + return -1; + } + + qpkt->buf = (uint8 *)malloc(sizeof(dhcp_pkt_t) + optlen); + + if(!qpkt->buf) { + free(qpkt); + rlock_unlock(dhcp_lock); + return -1; + } + + qpkt->size = sizeof(dhcp_pkt_t) + optlen; + memcpy(qpkt->buf, pkt, sizeof(dhcp_pkt_t) + optlen); + qpkt->pkt_type = DHCP_MSG_DHCPDISCOVER; + qpkt->next_send = 0; + qpkt->next_delay = 2000; + + STAILQ_INSERT_TAIL(&dhcp_pkts, qpkt, pkt_queue); + + state = DHCP_STATE_SELECTING; + + old = irq_disable(); + rlock_unlock(dhcp_lock); + + /* We need to wait til we're either bound to an IP address, or until we give + up all hope of doing so (give us 60 seconds). */ + + if(thd_current != dhcp_thd) { + rv = genwait_wait(qpkt, "net_dhcp_request", 60 * 1000, NULL); + } + + irq_restore(old); + + return rv; +} + +static void net_dhcp_send_request(dhcp_pkt_t *pkt, int pktlen, dhcp_pkt_t *pkt2, + int pkt2len) { + uint8 buf[1024]; + dhcp_pkt_t *req = (dhcp_pkt_t *)buf; + int optlen; + struct dhcp_pkt_out *qpkt; + uint32 serverid = net_dhcp_get_32bit(pkt, DHCP_OPTION_SERVER_ID, pktlen); + + if(serverid == 0) + return; + + /* Fill in the DHCP request */ + req->op = DHCP_OP_BOOTREQUEST; + req->htype = DHCP_HTYPE_10MB_ETHERNET; + req->hlen = DHCP_HLEN_ETHERNET; + req->hops = 0; + req->xid = pkt->xid; + req->secs = 0; + req->flags = 0; + req->ciaddr = 0; + req->yiaddr = 0; + req->siaddr = 0; + req->giaddr = 0; + memcpy(req->chaddr, net_default_dev->mac_addr, DHCP_HLEN_ETHERNET); + memset(req->chaddr + DHCP_HLEN_ETHERNET, 0, sizeof(req->chaddr) - + DHCP_HLEN_ETHERNET); + memset(req->sname, 0, sizeof(req->sname)); + memset(req->file, 0, sizeof(req->file)); + + /* Fill in options */ + optlen = net_dhcp_fill_options(net_default_dev, req, DHCP_MSG_DHCPREQUEST, + serverid, ntohl(pkt->yiaddr)); + + /* Add to our packet queue */ + qpkt = (struct dhcp_pkt_out *)malloc(sizeof(struct dhcp_pkt_out)); + + if(!qpkt) { + return; + } + + qpkt->buf = (uint8 *)malloc(sizeof(dhcp_pkt_t) + optlen); + + if(!qpkt->buf) { + free(qpkt); + return; + } + + qpkt->size = sizeof(dhcp_pkt_t) + optlen; + memcpy(qpkt->buf, buf, sizeof(dhcp_pkt_t) + optlen); + qpkt->pkt_type = DHCP_MSG_DHCPREQUEST; + qpkt->next_send = 0; + qpkt->next_delay = 2000; + + STAILQ_INSERT_TAIL(&dhcp_pkts, qpkt, pkt_queue); + + state = DHCP_STATE_REQUESTING; +} + +static void net_dhcp_renew() { + uint8 buf[1024]; + dhcp_pkt_t *req = (dhcp_pkt_t *)buf; + int optlen; + struct dhcp_pkt_out *qpkt; + + /* Fill in the DHCP request */ + req->op = DHCP_OP_BOOTREQUEST; + req->htype = DHCP_HTYPE_10MB_ETHERNET; + req->hlen = DHCP_HLEN_ETHERNET; + req->hops = 0; + req->xid = time(NULL) ^ 0xDEADBEEF; + req->secs = 0; + req->flags = 0; + req->ciaddr = htonl(net_ipv4_address(net_default_dev->ip_addr)); + req->yiaddr = 0; + req->siaddr = 0; + req->giaddr = 0; + memcpy(req->chaddr, net_default_dev->mac_addr, DHCP_HLEN_ETHERNET); + memset(req->chaddr + DHCP_HLEN_ETHERNET, 0, sizeof(req->chaddr) - + DHCP_HLEN_ETHERNET); + memset(req->sname, 0, sizeof(req->sname)); + memset(req->file, 0, sizeof(req->file)); + + /* Fill in options */ + optlen = net_dhcp_fill_options(net_default_dev, req, DHCP_MSG_DHCPREQUEST, + 0, ntohl(req->ciaddr)); + + /* Add to our packet queue */ + qpkt = (struct dhcp_pkt_out *)malloc(sizeof(struct dhcp_pkt_out)); + + if(!qpkt) { + return; + } + + qpkt->buf = (uint8 *)malloc(sizeof(dhcp_pkt_t) + optlen); + + if(!qpkt->buf) { + free(qpkt); + return; + } + + qpkt->size = sizeof(dhcp_pkt_t) + optlen; + memcpy(qpkt->buf, buf, sizeof(dhcp_pkt_t) + optlen); + qpkt->pkt_type = DHCP_MSG_DHCPREQUEST; + qpkt->next_send = 0; + qpkt->next_delay = 60000; + + STAILQ_INSERT_TAIL(&dhcp_pkts, qpkt, pkt_queue); +} + +static void net_dhcp_bind(dhcp_pkt_t *pkt, int len) { + uint32 tmp = ntohl(pkt->yiaddr); + uint32 old = irq_disable(); + + /* Bind the IP address first */ + net_default_dev->ip_addr[0] = (tmp >> 24) & 0xFF; + net_default_dev->ip_addr[1] = (tmp >> 16) & 0xFF; + net_default_dev->ip_addr[2] = (tmp >> 8) & 0xFF; + net_default_dev->ip_addr[3] = (tmp >> 0) & 0xFF; + + /* Grab the netmask if it was returned to us */ + tmp = net_dhcp_get_32bit(pkt, DHCP_OPTION_SUBNET_MASK, len); + + if(tmp != 0) { + net_default_dev->netmask[0] = (tmp >> 24) & 0xFF; + net_default_dev->netmask[1] = (tmp >> 16) & 0xFF; + net_default_dev->netmask[2] = (tmp >> 8) & 0xFF; + net_default_dev->netmask[3] = (tmp >> 0) & 0xFF; + } + + /* Grab the router address, if it was returned to us */ + tmp = net_dhcp_get_32bit(pkt, DHCP_OPTION_ROUTER, len); + + if(tmp != 0) { + net_default_dev->gateway[0] = (tmp >> 24) & 0xFF; + net_default_dev->gateway[1] = (tmp >> 16) & 0xFF; + net_default_dev->gateway[2] = (tmp >> 8) & 0xFF; + net_default_dev->gateway[3] = (tmp >> 0) & 0xFF; + } + + /* Grab the DNS address if it was returned to us */ + tmp = net_dhcp_get_32bit(pkt, DHCP_OPTION_NAME_SERVER, len); + + if(tmp != 0) { + net_default_dev->gateway[0] = (tmp >> 24) & 0xFF; + net_default_dev->gateway[1] = (tmp >> 16) & 0xFF; + net_default_dev->gateway[2] = (tmp >> 8) & 0xFF; + net_default_dev->gateway[3] = (tmp >> 0) & 0xFF; + } + + /* Grab the broadcast address if it was sent to us, otherwise infer it from + the netmask and IP address. */ + tmp = net_dhcp_get_32bit(pkt, DHCP_OPTION_BROADCAST_ADDR, len); + + if(tmp != 0) { + net_default_dev->broadcast[0] = (tmp >> 24) & 0xFF; + net_default_dev->broadcast[1] = (tmp >> 16) & 0xFF; + net_default_dev->broadcast[2] = (tmp >> 8) & 0xFF; + net_default_dev->broadcast[3] = (tmp >> 0) & 0xFF; + } + else { + net_default_dev->broadcast[0] = + net_default_dev->ip_addr[0] | (~net_default_dev->netmask[0]); + net_default_dev->broadcast[1] = + net_default_dev->ip_addr[1] | (~net_default_dev->netmask[1]); + net_default_dev->broadcast[2] = + net_default_dev->ip_addr[2] | (~net_default_dev->netmask[2]); + net_default_dev->broadcast[3] = + net_default_dev->ip_addr[3] | (~net_default_dev->netmask[3]); + } + + /* Grab the Lease expiry time */ + tmp = net_dhcp_get_32bit(pkt, DHCP_OPTION_IP_LEASE_TIME, len); + + if(tmp != 0 && tmp != 0xFFFFFFFF) { + /* Set our renewal timer to half the lease time and the rebinding timer + to .875 * lease time. */ + uint64 now = timer_ms_gettime64(); + int expiry = ntohl(tmp) * 1000; + + renew_time = now + (expiry >> 1); + rebind_time = now + (uint64)(expiry * 0.875); + lease_expires = now + expiry; + } + else if(tmp == 0xFFFFFFFF) { + renew_time = rebind_time = lease_expires = 0xFFFFFFFFFFFFFFFFULL; + } + + state = DHCP_STATE_BOUND; + + irq_restore(old); +} + +static void net_dhcp_thd(void *obj __attribute__((unused))) { + struct dhcp_pkt_out *qpkt; + uint64 now; + struct sockaddr_in addr; + uint8 buf[1024]; + ssize_t len = 0; + socklen_t addr_len = sizeof(struct sockaddr_in); + dhcp_pkt_t *pkt = (dhcp_pkt_t *)buf, *pkt2; + int found; + + for(;;) { + now = timer_ms_gettime64(); + len = 0; + + rlock_lock(dhcp_lock); + + /* Make sure we don't need to renew our lease */ + if(lease_expires <= now && (state == DHCP_STATE_BOUND || + state == DHCP_STATE_RENEWING || state == DHCP_STATE_REBINDING)) { + STAILQ_FOREACH(qpkt, &dhcp_pkts, pkt_queue) { + STAILQ_REMOVE(&dhcp_pkts, qpkt, dhcp_pkt_out, pkt_queue); + free(qpkt->buf); + free(qpkt); + } + + state = DHCP_STATE_INIT; + srv_addr.sin_addr.s_addr = INADDR_BROADCAST; + memset(net_default_dev->ip_addr, 0, 4); + net_dhcp_request(); + } + else if(rebind_time <= now && + (state == DHCP_STATE_BOUND || state == DHCP_STATE_RENEWING)) { + /* Clear out any existing packets. */ + STAILQ_FOREACH(qpkt, &dhcp_pkts, pkt_queue) { + STAILQ_REMOVE(&dhcp_pkts, qpkt, dhcp_pkt_out, pkt_queue); + free(qpkt->buf); + free(qpkt); + } + + state = DHCP_STATE_REBINDING; + srv_addr.sin_addr.s_addr = INADDR_BROADCAST; + net_dhcp_renew(); + } + else if(renew_time <= now && state == DHCP_STATE_BOUND) { + state = DHCP_STATE_RENEWING; + net_dhcp_renew(); + } + + /* Check if we have any packets waiting to come in. */ + while((len = recvfrom(dhcp_sock, buf, 1024, 0, + (struct sockaddr *)&addr, &addr_len)) != -1) { + /* Ignore any boot request packets -- they shouldn't be sent to + the port we're monitoring anyway. */ + if(pkt->op != DHCP_OP_BOOTREPLY) { + continue; + } + + /* Check the magic cookie to make sure we've actually got a DHCP + packet coming in. */ + if(pkt->options[0] != 0x63 || pkt->options[1] != 0x82 || + pkt->options[2] != 0x53 || pkt->options[3] != 0x63) { + continue; + } + + found = 0; + + /* Check the xid field of the new packet versus what we're still + waiting on responses for. */ + STAILQ_FOREACH(qpkt, &dhcp_pkts, pkt_queue) { + pkt2 = (dhcp_pkt_t *)qpkt->buf; + + if(pkt2->xid == pkt->xid) { + found = 1; + break; + } + } + + /* If we've found a pending request, act on the message received. */ + if(found) { + switch(net_dhcp_get_message_type(pkt2, qpkt->size)) { + case DHCP_MSG_DHCPDISCOVER: + if(net_dhcp_get_message_type(pkt, len) != + DHCP_MSG_DHCPOFFER) { + break; + } + + /* Send our DHCPREQUEST packet */ + net_dhcp_send_request(pkt, len, pkt2, qpkt->size); + + /* Remove the old packet from our queue */ + STAILQ_REMOVE(&dhcp_pkts, qpkt, dhcp_pkt_out, + pkt_queue); + free(qpkt->buf); + free(qpkt); + break; + + case DHCP_MSG_DHCPREQUEST: + found = net_dhcp_get_message_type(pkt, len); + + if(found == DHCP_MSG_DHCPACK) { + srv_addr.sin_addr.s_addr = addr.sin_addr.s_addr; + + /* Bind to the specified IP address */ + net_dhcp_bind(pkt, len); + genwait_wake_all(qpkt); + } + else if(found == DHCP_MSG_DHCPNAK) { + /* We got a NAK, try to discover again. */ + state = DHCP_STATE_INIT; + net_dhcp_request(); + } + + /* Remove the old packet from our queue */ + STAILQ_REMOVE(&dhcp_pkts, qpkt, dhcp_pkt_out, + pkt_queue); + free(qpkt->buf); + free(qpkt); + break; + + /* Currently, these are the only two DHCP packets the code + here sends out, so other packet types are omitted for + the time being. */ + } + } + } + + /* Send any packets that need to be sent. */ + STAILQ_FOREACH(qpkt, &dhcp_pkts, pkt_queue) { + if(qpkt->next_send <= now) { + sendto(dhcp_sock, qpkt->buf, qpkt->size, 0, + (struct sockaddr *)&srv_addr, sizeof(srv_addr)); + qpkt->next_send = now + qpkt->next_delay; + qpkt->next_delay <<= 1; + } + } + + rlock_unlock(dhcp_lock); + + /* Sleep for a while. */ + thd_sleep(25); + } +} + +int net_dhcp_init() { + struct sockaddr_in addr; + + /* Create our lock */ + dhcp_lock = rlock_create(); + + if(dhcp_lock == NULL) { + return -1; + } + + /* Create the DHCP socket */ + dhcp_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); + + if(dhcp_sock == -1) { + return -1; + } + + /* Bind the socket to the DHCP "Client" port */ + addr.sin_family = AF_INET; + addr.sin_port = htons(DHCP_CLIENT_PORT); + addr.sin_addr.s_addr = INADDR_ANY; + memset(addr.sin_zero, 0, sizeof(addr.sin_zero)); + + if(bind(dhcp_sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) { + return -2; + } + + /* Set up the server address */ + srv_addr.sin_family = AF_INET; + srv_addr.sin_port = htons(DHCP_SERVER_PORT); + srv_addr.sin_addr.s_addr = INADDR_BROADCAST; + memset(srv_addr.sin_zero, 0, sizeof(addr.sin_zero)); + + /* Make the socket non-blocking */ + fs_socket_setflags(dhcp_sock, O_NONBLOCK); + + /* Create the thread for processing DHCP packets */ + dhcp_thd = thd_create(&net_dhcp_thd, NULL); + + return 0; +} + +void net_dhcp_shutdown() { + int old = irq_disable(); + + if(dhcp_lock) { + rlock_destroy(dhcp_lock); + dhcp_lock = NULL; + } + + irq_restore(old); + + if(dhcp_sock != -1) { + close(dhcp_sock); + } +} Added: kos/kernel/net/net_dhcp.h =================================================================== --- kos/kernel/net/net_dhcp.h (rev 0) +++ kos/kernel/net/net_dhcp.h 2008-09-21 18:39:06 UTC (rev 610) @@ -0,0 +1,154 @@ +/* KallistiOS ##version## + + kernel/net/net_dhcp.h + Copyright (C) 2008 Lawrence Sebald + +*/ + +#ifndef __LOCAL_NET_DHCP_H +#define __LOCAL_NET_DHCP_H + +#include <sys/cdefs.h> + +__BEGIN_DECLS + +#include <arch/types.h> + +/* Available values for the op fields of dhcp_pkt_t */ +#define DHCP_OP_BOOTREQUEST 1 +#define DHCP_OP_BOOTREPLY 2 + +/* The defined htype for Ethernet */ +#define DHCP_HTYPE_10MB_ETHERNET 1 + +/* The length of an Ethernet hardware address */ +#define DHCP_HLEN_ETHERNET 6 + +/* DHCP Option types, as defined in RFC 2132. + Note that most of these aren't actually supported/used, but they're here + for completeness. */ +#define DHCP_OPTION_PAD 0 +#define DHCP_OPTION_SUBNET_MASK 1 +#define DHCP_OPTION_TIME_OFFSET 2 +#define DHCP_OPTION_ROUTER 3 +#define DHCP_OPTION_TIME_SERVER 4 +#define DHCP_OPTION_NAME_SERVER 5 +#define DHCP_OPTION_DOMAIN_NAME_SERVER 6 +#define DHCP_OPTION_LOG_SERVER 7 +#define DHCP_OPTION_COOKIE_SERVER 8 +#define DHCP_OPTION_LPR_SERVER 9 +#define DHCP_OPTION_IMPRESS_SERVER 10 +#define DHCP_OPTION_RESOURCE_LOC_SERVER 11 +#define DHCP_OPTION_HOST_NAME 12 +#define DHCP_OPTION_BOOT_FILE_SIZE 13 +#define DHCP_OPTION_MERIT_DUMP_FILE 14 +#define DHCP_OPTION_DOMAIN_NAME 15 +#define DHCP_OPTION_SWAP 16 +#define DHCP_OPTION_ROOT_PATH 17 +#define DHCP_OPTION_EXTENSIONS_PATH 18 +#define DHCP_OPTION_IP_FORWARDING 19 +#define DHCP_OPTION_NON_LOCAL_SRC_ROUTE 20 +#define DHCP_OPTION_POLICY_FILTER 21 +#define DHCP_OPTION_MAX_REASSEMBLY 22 +#define DHCP_OPTION_DEFAULT_TTL 23 +#define DHCP_OPTION_PATH_MTU_AGING_TIME 24 +#define DHCP_OPTION_PATH_MTU_PLATEAU 25 +#define DHCP_OPTION_INTERFACE_MTU 26 +#define DHCP_OPTION_ALL_SUBNETS_LOCAL 27 +#define DHCP_OPTION_BROADCAST_ADDR 28 +#define DHCP_OPTION_PERFORM_MASK_DISC 29 +#define DHCP_OPTION_MASK_SUPPLIER 30 +#define DHCP_OPTION_PERFORM_ROUTER_DISC 31 +#define DHCP_OPTION_ROUTER_SOLICT_ADDR 32 +#define DHCP_OPTION_STATIC_ROUTE 33 +#define DHCP_OPTION_TRAILER_ENCAPS 34 +#define DHCP_OPTION_ARP_CACHE_TIMEOUT 35 +#define DHCP_OPTION_ETHERNET_ENCAPS 36 +#define DHCP_OPTION_TCP_TTL 37 +#define DHCP_OPTION_TCP_KEEPALIVE_INT 38 +#define DHCP_OPTION_TCP_KEEPALIVE_GARB 39 +#define DHCP_OPTION_NIS_DOMAIN 40 +#define DHCP_OPTION_NIS_SERVER 41 +#define DHCP_OPTION_NTP_SERVER 42 +#define DHCP_OPTION_VENDOR 43 +#define DHCP_OPTION_NBNS_NAME_SERVER 44 +#define DHCP_OPTION_NBDD_SERVER 45 +#define DHCP_OPTION_NB_NODE_TYPE 46 +#define DHCP_OPTION_NB_SCOPE 47 +#define DHCP_OPTION_X_FONT_SERVER 48 +#define DHCP_OPTION_X_DISPLAY_MGR 49 +#define DHCP_OPTION_REQ_IP_ADDR 50 +#define DHCP_OPTION_IP_LEASE_TIME 51 +#define DHCP_OPTION_OVERLOAD 52 +#define DHCP_OPTION_MESSAGE_TYPE 53 +#define DHCP_OPTION_SERVER_ID 54 +#define DHCP_OPTION_PARAMETER_REQUEST 55 +#define DHCP_OPTION_MESSAGE 56 +#define DHCP_OPTION_MAX_MESSAGE 57 +#define DHCP_OPTION_RENEWAL_TIME 58 +#define DHCP_OPTION_REBINDING_TIME 59 +#define DHCP_OPTION_VENDOR_CLASS_ID 60 +#define DHCP_OPTION_CLIENT_ID 61 +/* 62 and 63 undefined by RFC 2132 */ +#define DHCP_OPTION_NISPLUS_DOMAIN 64 +#define DHCP_OPTION_NISPLUS_SERVER 65 +#define DHCP_OPTION_TFTP_SERVER 66 +#define DHCP_OPTION_BOOTFILE_NAME 67 +#define DHCP_OPTION_MIP_HOME_AGENT 68 +#define DHCP_OPTION_SMTP_SERVER 69 +#define DHCP_OPTION_POP3_SERVER 70 +#define DHCP_OPTION_NNTP_SERVER 71 +#define DHCP_OPTION_WWW_SERVER 72 +#define DHCP_OPTION_FINGER_SERVER 73 +#define DHCP_OPTION_IRC_SERVER 74 +#define DHCP_OPTION_STREETTALK_SERVER 75 +#define DHCP_OPTION_STDA_SERVER 76 +#define DHCP_OPTION_END 255 + +/* DHCP Message Types, as defined in RFC 2132. */ +#define DHCP_MSG_DHCPDISCOVER 1 +#define DHCP_MSG_DHCPOFFER 2 +#define DHCP_MSG_DHCPREQUEST 3 +#define DHCP_MSG_DHCPDECLINE 4 +#define DHCP_MSG_DHCPACK 5 +#define DHCP_MSG_DHCPNAK 6 +#define DHCP_MSG_DHCPRELEASE 7 +#define DHCP_MSG_DHCPINFORM 8 + +/* DHCP Client States */ +#define DHCP_STATE_INIT 0 +#define DHCP_STATE_SELECTING 1 +#define DHCP_STATE_REQUESTING 2 +#define DHCP_STATE_BOUND 3 +#define DHCP_STATE_RENEWING 4 +#define DHCP_STATE_REBINDING 5 +#define DHCP_STATE_INIT_REBOOT 6 +#define DHCP_STATE_REBOOTING 7 + +typedef struct dhcp_pkt { + uint8 op; + uint8 htype; + uint8 hlen; + uint8 hops; + uint32 xid; + uint16 secs; + uint16 flags; + uint32 ciaddr; + uint32 yiaddr; + uint32 siaddr; + uint32 giaddr; + uint8 chaddr[16]; + char sname[64]; + char file[128]; + uint8 options[]; +} __attribute__((packed)) dhcp_pkt_t; + +int net_dhcp_init(); + +void net_dhcp_shutdown(); + +int net_dhcp_request(); + +__END_DECLS + +#endif /* !__LOCAL_NET_DHCP_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-09-17 09:10:19
|
Revision: 609 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=609&view=rev Author: ljsebald Date: 2008-09-17 16:10:14 +0000 (Wed, 17 Sep 2008) Log Message: ----------- Adding in code to fetch ISP settings that are set by PlanetWeb. Also, this commit includes various fixups for the fact that the flashrom_ispcfg_t struct got a bit of a makeover in the process so that it supports both PlanetWeb and DreamPassport in a generic fashion. Modified Paths: -------------- kos/addons/libkosutils/netcfg.c kos/doc/CHANGELOG kos/kernel/arch/dreamcast/hardware/flashrom.c kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c kos/kernel/arch/dreamcast/include/dc/flashrom.h Modified: kos/addons/libkosutils/netcfg.c =================================================================== --- kos/addons/libkosutils/netcfg.c 2008-09-14 03:54:09 UTC (rev 608) +++ kos/addons/libkosutils/netcfg.c 2008-09-17 16:10:14 UTC (rev 609) @@ -175,32 +175,37 @@ ((src[2]) << 8) | \ ((src[3]) << 0) - if (cfg.ip_valid) { + if (cfg.valid_fields & FLASHROM_ISP_IP) READIP(out->ip, cfg.ip); + if (cfg.valid_fields & FLASHROM_ISP_GATEWAY) READIP(out->gateway, cfg.gw); + if (cfg.valid_fields & FLASHROM_ISP_NETMASK) READIP(out->netmask, cfg.nm); + if (cfg.valid_fields & FLASHROM_ISP_BROADCAST) READIP(out->broadcast, cfg.bc); + if (cfg.valid_fields & FLASHROM_ISP_DNS) { READIP(out->dns[0], cfg.dns[0]); READIP(out->dns[1], cfg.dns[1]); + } + if (cfg.valid_fields & FLASHROM_ISP_HOSTNAME) strcpy(out->hostname, cfg.hostname); - } - if (cfg.email_valid) + if (cfg.valid_fields & FLASHROM_ISP_EMAIL) strcpy(out->email, cfg.email); - if (cfg.smtp_valid) + if (cfg.valid_fields & FLASHROM_ISP_SMTP) strcpy(out->smtp, cfg.smtp); - if (cfg.pop3_valid) + if (cfg.valid_fields & FLASHROM_ISP_POP3) strcpy(out->pop3, cfg.pop3); - if (cfg.pop3_login_valid) + if (cfg.valid_fields & FLASHROM_ISP_POP3_USER) strcpy(out->pop3_login, cfg.pop3_login); - if (cfg.pop3_passwd_valid) { + if (cfg.valid_fields & FLASHROM_ISP_POP3_PASS) strcpy(out->pop3_passwd, cfg.pop3_passwd); + if (cfg.valid_fields & FLASHROM_ISP_PROXY_PORT) out->proxy_port = cfg.proxy_port; - } - if (cfg.ppp_login_valid) { + if (cfg.valid_fields & FLASHROM_ISP_PROXY_HOST) strcpy(out->proxy_host, cfg.proxy_host); + if (cfg.valid_fields & FLASHROM_ISP_PPP_USER) strcpy(out->ppp_login, cfg.ppp_login); - } - if (cfg.ppp_passwd_valid) + if (cfg.valid_fields & FLASHROM_ISP_PPP_PASS) strcpy(out->ppp_passwd, cfg.ppp_passwd); #undef READIP Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-09-14 03:54:09 UTC (rev 608) +++ kos/doc/CHANGELOG 2008-09-17 16:10:14 UTC (rev 609) @@ -172,6 +172,10 @@ - *** Fixes to the network stack to support sending/receiving broadcast packets properly [LS] - GBA Fixed arch/types.h so the toolchain can compile. [HL] +- DC Adjusted the flashrom_ispcfg_t structure to account for differences + between PlanetWeb and DreamPassport [LS] +- DC Added reading of the ISP settings from PlanetWeb to the flashrom code [LS] +- DC Fixed various pieces of code that rely on flashrom_ispcfg_t [LS] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/kernel/arch/dreamcast/hardware/flashrom.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/flashrom.c 2008-09-14 03:54:09 UTC (rev 608) +++ kos/kernel/arch/dreamcast/hardware/flashrom.c 2008-09-17 16:10:14 UTC (rev 609) @@ -2,6 +2,7 @@ flashrom.c Copyright (c)2003 Dan Potter + Copyright (C)2008 Lawrence Sebald */ /* @@ -21,8 +22,6 @@ #include <dc/flashrom.h> #include <arch/irq.h> -CVSID("$Id: flashrom.c,v 1.4 2003/03/10 01:45:31 bardtx Exp $"); - /* This is the fateful define. Re-enable this at the peril of your Dreamcast's soul ;) */ /* #define ENABLE_WRITES 1 */ @@ -371,7 +370,9 @@ memcpy(out->dns[1], isp->e0.dns2, 4); memcpy(out->hostname, isp->e0.hostname, 24); - out->ip_valid = 1; + out->valid_fields |= FLASHROM_ISP_IP | FLASHROM_ISP_NETMASK | + FLASHROM_ISP_BROADCAST | FLASHROM_ISP_GATEWAY | FLASHROM_ISP_DNS | + FLASHROM_ISP_HOSTNAME; found++; } @@ -380,7 +381,7 @@ /* Fill in the values from it */ memcpy(out->email, isp->e2.email, 48); - out->email_valid = 1; + out->valid_fields |= FLASHROM_ISP_EMAIL; found++; } @@ -389,7 +390,7 @@ /* Fill in the values from it */ memcpy(out->smtp, isp->e4.smtp, 28); - out->smtp_valid = 1; + out->valid_fields |= FLASHROM_ISP_SMTP; found++; } @@ -398,7 +399,7 @@ /* Fill in the values from it */ memcpy(out->pop3, isp->e5.pop3, 24); - out->pop3_valid = 1; + out->valid_fields |= FLASHROM_ISP_POP3; found++; } @@ -407,7 +408,7 @@ /* Fill in the values from it */ memcpy(out->pop3_login, isp->e6.pop3_login, 20); - out->pop3_login_valid = 1; + out->valid_fields |= FLASHROM_ISP_POP3_USER; found++; } @@ -417,7 +418,7 @@ memcpy(out->pop3_passwd, isp->e7.pop3_passwd, 32); memcpy(out->proxy_host, isp->e7.proxy_host, 16); - out->pop3_passwd_valid = 1; + out->valid_fields |= FLASHROM_ISP_POP3_PASS | FLASHROM_ISP_PROXY_HOST; found++; } @@ -427,7 +428,7 @@ out->proxy_port = isp->e8.proxy_port; memcpy(out->ppp_login, isp->e8.ppp_login, 8); - out->ppp_login_valid = 1; + out->valid_fields |= FLASHROM_ISP_PROXY_PORT | FLASHROM_ISP_PPP_USER; found++; } @@ -436,9 +437,353 @@ /* Fill in the values from it */ memcpy(out->ppp_passwd, isp->e9.ppp_passwd, 20); - out->ppp_passwd_valid = 1; + out->valid_fields |= FLASHROM_ISP_PPP_PASS; found++; } return found > 0 ? 0 : -1; } + +/* Structure of the ISP configuration blocks created by PlanetWeb (confirmed on + version 1.0 and 2.1; some fields are longer on 2.1, but they always extend + into what would be padding in 1.0). */ +typedef struct { + union { + struct { + /* Block 0x80 */ + uint16 blockid; /* Should be 0x80 */ + char prodname[9]; /* Should be 'PWBrowser' */ + uint8 unk1[2]; /* Unknown: 00 16 (1.0), 00 1C (2.1) */ + uint8 dial_areacode; /* 1 = Dial area code, 0 = don't */ + char out_prefix[8]; /* Outside dial prefix */ + uint8 padding1[8]; + char email_pt2[16]; /* Second? part of email address (2.1) */ + char cw_prefix[8]; /* Call waiting prefix */ + uint8 padding2[8]; + uint16 crc; + } b80; + + struct { + /* Block 0x81 */ + uint16 blockid; /* Should be 0x81 */ + char email_pt3[14]; /* Third? part of email address (2.1)*/ + uint8 padding1[2]; + char real_name[30]; /* The "Real Name" (21 bytes on 1.0) */ + uint8 padding2[14]; + uint16 crc; + } b81; + + struct { + /* Block 0x82 */ + uint16 blockid; /* Should be 0x82 */ + uint8 padding1[30]; + char modem_str[30]; /* Modem init string (confirmed on 2.1) */ + uint16 crc; + } b82; + + struct { + /* Block 0x83 */ + uint16 blockid; /* Should be 0x83 */ + uint8 modem_str2[2]; /* Modem init string continued */ + char area_code[3]; + uint8 padding2[29]; + char ld_prefix[20]; /* Long-distance prefix */ + uint8 padding3[6]; + uint16 crc; + } b83; + + struct { + /* Block 0x84 -- This one is pretty much mostly a mystery. */ + uint16 blockid; /* Should be 0x84 */ + uint8 unk1[6]; /* Might be padding, all 0x00s */ + uint8 use_proxy; /* 1 = use proxy, 0 = don't */ + uint8 unk2[53]; /* No idea on this stuff... */ + uint16 crc; + } b84; + + /* Other 0x80 range blocks might be used, but I don't really know what + would be in them. */ + + struct { + /* Block 0xC0 */ + uint16 blockid; /* Should be 0xC0 */ + uint8 unk1; /* Might be padding? (0x00) */ + uint8 settings; /* Bitfield: + bit 0 = pulse dial (1) or tone dial (0), + bit 7 = blind dial (1) or not (0) */ + uint8 unk2[2]; /* Might be padding (0x00 0x00) */ + char prodname[4]; /* Should be 'SEGA' */ + char ppp_login[28]; + char ppp_passwd[16]; + char ac1[5]; /* Area code for phone 1, in parenthesis */ + char phone1_pt1[3]; /* First three digits of phone 1 */ + uint16 crc; + } c0; + + struct { + /* Block 0xC1 */ + uint16 blockid; /* Should be 0xC1 */ + char phone1_pt2[22]; /* Rest of phone 1 */ + uint8 padding[10]; + char ac2[5]; /* Area code for phone 2, in parenthesis */ + char phone2_pt1[23]; /* First 23 digits of phone 2 */ + uint16 crc; + } c1; + + struct { + /* Block 0xC2 */ + uint16 blockid; /* Should be 0xC2 */ + char phone2_pt2[2]; /* Last two digits of phone 2 */ + uint8 padding[50]; + uint8 dns1[4]; /* DNS 1, big endian notation */ + uint8 dns2[4]; /* DNS 2, big endian notation */ + uint16 crc; + } c2; + + struct { + /* Block 0xC3 */ + uint16 blockid; /* Should be 0xC3 */ + char email_p1[32]; /* First? part of the email address + (This is the only part on 1.0) */ + uint8 padding[16]; + char out_srv_p1[12]; /* Outgoing email server, first 12 chars */ + uint16 crc; + } c3; + + struct { + /* Block 0xC4 */ + uint16 blockid; /* Should be 0xC4 */ + char out_srv_p2[18]; /* Rest of outgoing email server */ + uint8 padding1[2]; + char in_srv[30]; /* Incoming email server */ + uint8 padding2[2]; + char em_login_p1[8]; /* Email login, first 8 chars */ + uint16 crc; + } c4; + + struct { + /* Block 0xC5 */ + uint16 blockid; /* Should be 0xC5 */ + char em_login_p2[8]; /* Rest of email login */ + char em_passwd[16]; /* Email password */ + char proxy_srv[30]; /* Proxy Server */ + uint8 padding1[2]; + uint16 proxy_port; /* Proxy port, little endian notation */ + uint8 padding2[2]; + uint16 crc; + } c5; + + /* Blocks 0xC6 - 0xCB also appear to be used by PlanetWeb, but are + always blank in my tests. My only guess is that they were storage + for a potential second ISP setting set. */ + }; +} pw_isp_settings_t; + +int flashrom_get_pw_ispcfg(flashrom_ispcfg_t *out) { + uint8 buffer[64]; + pw_isp_settings_t *isp = (pw_isp_settings_t *)buffer; + + /* Clear our output buffer completely. */ + memset(out, 0, sizeof(flashrom_ispcfg_t)); + + /* Get the 0x80 block first, and check if its valid. */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_SETTINGS_1, buffer) >= 0) { + /* Make sure the product name is 'PWBrowser' */ + if(strncmp(isp->b80.prodname, "PWBrowser", 9)) { + return -1; + } + + /* Determine if the dial area code option is set or not. */ + if(isp->b80.dial_areacode) { + out->flags |= FLASHROM_ISP_DIAL_AREACODE; + } + + /* Copy out the outside dial prefix. */ + strncpy(out->out_prefix, isp->b80.out_prefix, 8); + out->out_prefix[8] = '\0'; + out->valid_fields |= FLASHROM_ISP_OUT_PREFIX; + + /* Copy out the call waiting prefix. */ + strncpy(out->cw_prefix, isp->b80.cw_prefix, 8); + out->cw_prefix[8] = '\0'; + out->valid_fields |= FLASHROM_ISP_CW_PREFIX; + + /* Copy the second part of the email address (if it exists). We don't + set the email as valid here, since that really depends on the first + part being found (PW 1.0 doesn't store anything in this place). */ + strncpy(out->email + 32, isp->b80.email_pt2, 16); + } + else { + /* If we couldn't find the PWBrowser block, punt, the PlanetWeb settings + most likely do not exist. */ + return -1; + } + + /* Grab block 0x81 */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_SETTINGS_2, buffer) >= 0) { + /* Copy the third part of the email address to the appropriate place. + Note that PlanetWeb 1.0 doesn't store anything here, thus we'll just + copy a null terminator. */ + strncpy(out->email + 32 + 16, isp->b81.email_pt3, 14); + + /* Copy out the "Real Name" field. */ + strncpy(out->real_name, isp->b81.real_name, 30); + out->real_name[30] = '\0'; + out->valid_fields |= FLASHROM_ISP_REAL_NAME; + } + + /* Grab block 0x82 */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_SETTINGS_3, buffer) >= 0) { + /* The only thing in this block is the modem init string, go ahead and + copy it to our destination. */ + strncpy(out->modem_init, isp->b82.modem_str, 30); + out->modem_init[30] = '\0'; + out->valid_fields |= FLASHROM_ISP_MODEM_INIT; + } + + /* Grab block 0x83 */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_SETTINGS_4, buffer) >= 0) { + /* The modem init string continues at the start of this block. */ + strncpy(out->modem_init + 30, isp->b83.modem_str2, 2); + out->modem_init[32] = '\0'; + + /* Copy out the area code next. */ + strncpy(out->area_code, isp->b83.area_code, 3); + out->area_code[3] = '\0'; + out->valid_fields |= FLASHROM_ISP_AREA_CODE; + + /* Copy the long-distance dial prefix */ + strncpy(out->ld_prefix, isp->b83.ld_prefix, 20); + out->ld_prefix[20] = '\0'; + out->valid_fields |= FLASHROM_ISP_LD_PREFIX; + } + + /* Grab block 0x84 -- Most of this block is currently unknown */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_SETTINGS_5, buffer) >= 0) { + /* The only thing currently known in here is the use proxy flag. */ + if(isp->b84.use_proxy) { + out->flags |= FLASHROM_ISP_USE_PROXY; + } + } + + /* Other 0x85-0x8F blocks might be used, but I have no ideas on their use. */ + + /* Grab block 0xC0 */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_PPP1, buffer) >= 0) { + /* Make sure the product id is "SEGA". */ + if(strncmp(isp->c0.prodname, "SEGA", 4)) { + return -1; + } + + /* Check the settings first. */ + if(isp->c0.settings & 0x01) { + out->flags |= FLASHROM_ISP_PULSE_DIAL; + } + + if(isp->c0.settings & 0x80) { + out->flags |= FLASHROM_ISP_BLIND_DIAL; + } + + /* Grab the PPP Username. */ + strncpy(out->ppp_login, isp->c0.ppp_login, 28); + out->ppp_login[28] = '\0'; + out->valid_fields |= FLASHROM_ISP_PPP_USER; + + /* Grab the PPP Password. */ + strncpy(out->ppp_passwd, isp->c0.ppp_passwd, 16); + out->ppp_passwd[16] = '\0'; + out->valid_fields |= FLASHROM_ISP_PPP_PASS; + + /* Grab the area code for phone 1, stripping away the parenthesis. */ + strncpy(out->p1_areacode, isp->c0.ac1 + 1, 3); + out->p1_areacode[3] = '\0'; + + /* Grab the start of phone number 1. */ + strncpy(out->phone1, isp->c0.phone1_pt1, 3); + out->phone1[3] = '\0'; + } + + /* Grab block 0xC1 */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_PPP2, buffer) >= 0) { + /* Grab the rest of phone number 1. */ + strncpy(out->phone1 + 3, isp->c1.phone1_pt2, 22); + out->phone1[25] = '\0'; + out->valid_fields |= FLASHROM_ISP_PHONE1; + + /* Grab the area code for phone 2, stripping away the parenthesis. */ + strncpy(out->p2_areacode, isp->c1.ac2 + 1, 3); + out->p2_areacode[3] = '\0'; + + /* Grab the start of phone number 2. */ + strncpy(out->phone2, isp->c1.phone2_pt1, 23); + out->phone2[23] = '\0'; + } + + /* Grab block 0xC2 */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_DNS, buffer) >= 0) { + /* Grab the last two digits of phone number 2. */ + out->phone2[23] = isp->c2.phone2_pt2[0]; + out->phone2[24] = isp->c2.phone2_pt2[1]; + out->phone2[25] = '\0'; + out->valid_fields |= FLASHROM_ISP_PHONE2; + + /* Grab the two DNS addresses. */ + memcpy(out->dns[0], isp->c2.dns1, 4); + memcpy(out->dns[1], isp->c2.dns2, 4); + out->valid_fields |= FLASHROM_ISP_DNS; + } + + /* Grab block 0xC3 */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_EMAIL1, buffer) >= 0) { + /* Grab the beginning of the email address (or all of it in PW 1.0). */ + strncpy(out->email, isp->c3.email_p1, 32); + out->valid_fields |= FLASHROM_ISP_EMAIL; + + /* Grab the beginning of the SMTP server. */ + strncpy(out->smtp, isp->c3.out_srv_p1, 12); + out->smtp[12] = '\0'; + } + + /* Grab block 0xC4 */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_EMAIL2, buffer) >= 0) { + /* Grab the end of the SMTP server. */ + strncpy(out->smtp + 12, isp->c4.out_srv_p2, 18); + out->smtp[30] = '\0'; + out->valid_fields |= FLASHROM_ISP_SMTP; + + /* Grab the POP3 server. */ + strncpy(out->pop3, isp->c4.in_srv, 30); + out->pop3[30] = '\0'; + out->valid_fields |= FLASHROM_ISP_POP3; + + /* Grab the beginning of the POP3 login. */ + strncpy(out->pop3_login, isp->c4.em_login_p1, 8); + out->pop3_login[8] = '\0'; + } + + /* Grab block 0xC5 */ + if(flashrom_get_block(FLASHROM_PT_BLOCK_1, FLASHROM_B1_PW_EMAIL_PROXY, buffer) >= 0) { + /* Grab the end of the POP3 login. */ + strncpy(out->pop3_login + 8, isp->c5.em_login_p2, 8); + out->pop3_login[16] = '\0'; + out->valid_fields |= FLASHROM_ISP_POP3_USER; + + /* Grab the POP3 password. */ + strncpy(out->pop3_passwd, isp->c5.em_passwd, 16); + out->pop3_passwd[16] = '\0'; + out->valid_fields |= FLASHROM_ISP_POP3_PASS; + + /* Grab the proxy server. */ + strncpy(out->proxy_host, isp->c5.proxy_srv, 30); + out->proxy_host[30] = '\0'; + out->valid_fields |= FLASHROM_ISP_PROXY_HOST; + + /* Grab the proxy port. */ + out->proxy_port = isp->c5.proxy_port; + out->valid_fields |= FLASHROM_ISP_PROXY_PORT; + } + + out->method = FLASHROM_ISP_DIALUP; + + return out->valid_fields == 0 ? -2 : 0; +} Modified: kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c 2008-09-14 03:54:09 UTC (rev 608) +++ kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c 2008-09-17 16:10:14 UTC (rev 609) @@ -1002,11 +1002,13 @@ /* Set ISP configuration from the flashrom, as long as we're configured staticly */ static void bba_set_ispcfg() { flashrom_ispcfg_t isp; + uint32 fields = FLASHROM_ISP_IP | FLASHROM_ISP_NETMASK | + FLASHROM_ISP_BROADCAST | FLASHROM_ISP_GATEWAY; if(flashrom_get_ispcfg(&isp) == -1) return; - if(!isp.ip_valid) + if((isp.valid_fields & fields) != fields) return; if(isp.method != FLASHROM_ISP_STATIC) Modified: kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c 2008-09-14 03:54:09 UTC (rev 608) +++ kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c 2008-09-17 16:10:14 UTC (rev 609) @@ -636,11 +636,13 @@ /* Set ISP configuration from the flashrom, as long as we're configured staticly */ static void la_set_ispcfg() { flashrom_ispcfg_t isp; + uint32 fields = FLASHROM_ISP_IP | FLASHROM_ISP_NETMASK | + FLASHROM_ISP_BROADCAST | FLASHROM_ISP_GATEWAY; if(flashrom_get_ispcfg(&isp) == -1) return; - if(!isp.ip_valid) + if((isp.valid_fields & fields) != fields) return; if(isp.method != FLASHROM_ISP_STATIC) Modified: kos/kernel/arch/dreamcast/include/dc/flashrom.h =================================================================== --- kos/kernel/arch/dreamcast/include/dc/flashrom.h 2008-09-14 03:54:09 UTC (rev 608) +++ kos/kernel/arch/dreamcast/include/dc/flashrom.h 2008-09-17 16:10:14 UTC (rev 609) @@ -2,8 +2,8 @@ kernel/arch/dreamcast/include/dc/flashrom.h Copyright (C)2003 Dan Potter + Copyright (C)2008 Lawrence Sebald - $Id: flashrom.h,v 1.4 2003/03/10 01:45:32 bardtx Exp $ */ @@ -36,15 +36,26 @@ /** An enumeration of logical blocks available in the flashrom. */ -#define FLASHROM_B1_SYSCFG 0x05 /*< System config (BLOCK_1) */ -#define FLASHROM_B1_IP_SETTINGS 0xE0 /*< IP settings for BBA (BLOCK_1) */ -#define FLASHROM_B1_EMAIL 0xE2 /*< Email address (BLOCK_1) */ -#define FLASHROM_B1_SMTP 0xE4 /*< SMTP server setting (BLOCK_1) */ -#define FLASHROM_B1_POP3 0xE5 /*< POP3 server setting (BLOCK_1) */ -#define FLASHROM_B1_POP3LOGIN 0xE6 /*< POP3 login setting (BLOCK_1) */ -#define FLASHROM_B1_POP3PASSWD 0xE7 /*< POP3 password setting + proxy (BLOCK_1) */ -#define FLASHROM_B1_PPPLOGIN 0xE8 /*< PPP username + proxy (BLOCK_1) */ -#define FLASHROM_B1_PPPPASSWD 0xE9 /*< PPP passwd (BLOCK_1) */ +#define FLASHROM_B1_SYSCFG 0x05 /*< System config (BLOCK_1) */ +#define FLASHROM_B1_PW_SETTINGS_1 0x80 /*< PlanetWeb settings (BLOCK_1) */ +#define FLASHROM_B1_PW_SETTINGS_2 0x81 /*< PlanetWeb settings (BLOCK_1) */ +#define FLASHROM_B1_PW_SETTINGS_3 0x82 /*< PlanetWeb settings (BLOCK_1) */ +#define FLASHROM_B1_PW_SETTINGS_4 0x83 /*< PlanetWeb settings (BLOCK_1) */ +#define FLASHROM_B1_PW_SETTINGS_5 0x84 /*< PlanetWeb settings (BLOCK_1) */ +#define FLASHROM_B1_PW_PPP1 0xC0 /*< PlanetWeb PPP settings (BLOCK_1) */ +#define FLASHROM_B1_PW_PPP2 0xC1 /*< PlanetWeb PPP settings (BLOCK_1) */ +#define FLASHROM_B1_PW_DNS 0xC2 /*< PlanetWeb DNS settings (BLOCK_1) */ +#define FLASHROM_B1_PW_EMAIL1 0xC3 /*< PlanetWeb Email settings (BLOCK_1) */ +#define FLASHROM_B1_PW_EMAIL2 0xC4 /*< PlanetWeb Email settings (BLOCK_1) */ +#define FLASHROM_B1_PW_EMAIL_PROXY 0xC5 /*< PlanetWeb Email/Proxy settings (BLOCK_1) */ +#define FLASHROM_B1_IP_SETTINGS 0xE0 /*< IP settings for BBA (BLOCK_1) */ +#define FLASHROM_B1_EMAIL 0xE2 /*< Email address (BLOCK_1) */ +#define FLASHROM_B1_SMTP 0xE4 /*< SMTP server setting (BLOCK_1) */ +#define FLASHROM_B1_POP3 0xE5 /*< POP3 server setting (BLOCK_1) */ +#define FLASHROM_B1_POP3LOGIN 0xE6 /*< POP3 login setting (BLOCK_1) */ +#define FLASHROM_B1_POP3PASSWD 0xE7 /*< POP3 password setting + proxy (BLOCK_1) */ +#define FLASHROM_B1_PPPLOGIN 0xE8 /*< PPP username + proxy (BLOCK_1) */ +#define FLASHROM_B1_PPPPASSWD 0xE9 /*< PPP passwd (BLOCK_1) */ /** Implements the FLASHROM_INFO syscall; given a partition ID, @@ -133,50 +144,90 @@ #define FLASHROM_ISP_PPPOE 4 /** - This struct will be filled by calling flashrom_get_isp_settings below. - Thanks to Sam Steele for this info. */ + Valid field constants in the ispcfg structure. */ +#define FLASHROM_ISP_IP (1 << 0) +#define FLASHROM_ISP_NETMASK (1 << 1) +#define FLASHROM_ISP_BROADCAST (1 << 2) +#define FLASHROM_ISP_GATEWAY (1 << 3) +#define FLASHROM_ISP_DNS (1 << 4) +#define FLASHROM_ISP_HOSTNAME (1 << 5) +#define FLASHROM_ISP_EMAIL (1 << 6) +#define FLASHROM_ISP_SMTP (1 << 7) +#define FLASHROM_ISP_POP3 (1 << 8) +#define FLASHROM_ISP_POP3_USER (1 << 9) +#define FLASHROM_ISP_POP3_PASS (1 << 10) +#define FLASHROM_ISP_PROXY_HOST (1 << 11) +#define FLASHROM_ISP_PROXY_PORT (1 << 12) +#define FLASHROM_ISP_PPP_USER (1 << 13) +#define FLASHROM_ISP_PPP_PASS (1 << 14) +#define FLASHROM_ISP_OUT_PREFIX (1 << 15) +#define FLASHROM_ISP_CW_PREFIX (1 << 16) +#define FLASHROM_ISP_REAL_NAME (1 << 17) +#define FLASHROM_ISP_MODEM_INIT (1 << 18) +#define FLASHROM_ISP_AREA_CODE (1 << 19) +#define FLASHROM_ISP_LD_PREFIX (1 << 20) +#define FLASHROM_ISP_PHONE1 (1 << 21) +#define FLASHROM_ISP_PHONE2 (1 << 22) + +/** + Flags for the ispcfg structure */ +#define FLASHROM_ISP_DIAL_AREACODE (1 << 0) +#define FLASHROM_ISP_USE_PROXY (1 << 1) +#define FLASHROM_ISP_PULSE_DIAL (1 << 2) +#define FLASHROM_ISP_BLIND_DIAL (1 << 3) + +/** + This struct will be filled by calling flashrom_get_ispcfg below. + Thanks to Sam Steele for the information on DreamPassport's ISP settings. + Note that this structure has been completely reworked so that it is more + generic and can support both DreamPassport and PlanetWeb's settings. */ typedef struct flashrom_ispcfg { - int ip_valid; /*< >0 if the IP settings are valid */ int method; /*< DHCP, Static, dialup(?), PPPoE */ + uint32 valid_fields; /*< Which fields are valid? */ + uint32 flags; /*< Various flags that can be set in options */ + uint8 ip[4]; /*< Host IP address */ uint8 nm[4]; /*< Netmask */ uint8 bc[4]; /*< Broadcast address */ uint8 gw[4]; /*< Gateway address */ uint8 dns[2][4]; /*< DNS servers (2) */ + int proxy_port; /*< Proxy server port */ char hostname[24]; /*< DHCP/Host name */ - - int email_valid; /*< >0 if the email setting is valid */ - char email[48]; /*< Email address */ - - int smtp_valid; /*< >0 if the smtp setting is valid */ - char smtp[28]; /*< SMTP server */ - - int pop3_valid; /*< >0 if the pop3 setting is valid */ - char pop3[24]; /*< POP3 server */ - - int pop3_login_valid; /*< >0 if the login setting is valid */ + char email[64]; /*< Email address */ + char smtp[31]; /*< SMTP server */ + char pop3[31]; /*< POP3 server */ char pop3_login[20]; /*< POP3 login */ - - int pop3_passwd_valid; /*< >0 if the passwd/proxy setting is valid */ char pop3_passwd[32]; /*< POP3 passwd */ - char proxy_host[16]; /*< Proxy server hostname */ - - int ppp_login_valid; /*< >0 if the PPP login/proxy setting is valid */ - int proxy_port; /*< Proxy server port */ - char ppp_login[8]; /*< PPP login */ - - int ppp_passwd_valid; /*< >0 if the PPP passwd setting is valid */ + char proxy_host[31]; /*< Proxy server hostname */ + char ppp_login[29]; /*< PPP login */ char ppp_passwd[20]; /*< PPP password */ + char out_prefix[9]; /*< Outside dial prefix */ + char cw_prefix[9]; /*< Call waiting prefix */ + char real_name[31]; /*< The "Real Name" field of PlanetWeb */ + char modem_init[33]; /*< The modem init string to use */ + char area_code[4]; /*< The area code the user is in */ + char ld_prefix[21]; /*< The long-distance dial prefix */ + char p1_areacode[4]; /*< Phone number 1's area code */ + char phone1[26]; /*< Phone number 1 */ + char p2_areacode[4]; /*< Phone number 2's area code */ + char phone2[26]; /*< Phone number 2 */ } flashrom_ispcfg_t; /** - Retrieves the console's ISP settings, if they exist. These are set by - programs like Dream Passport 3. Returns -1 on error (none of the settings - can be found, or some other error), or >=0 on success. You should check - the _valid member of the matching part of the struct before relying on - the data. */ + Retrieves the console's ISP settings as set by DreamPassport, if they exist. + Returns -1 on error (none of the settings can be found, or some other error), + or >=0 on success. You should check the valid_fields bitfield for the part of + the struct you want before relying on the data. */ int flashrom_get_ispcfg(flashrom_ispcfg_t * out); +/** + Retrieves the console's ISP settings as set by PlanetWeb (1.0 and 2.1 have + been verified to work), if they exist. Returns -1 on error (generally if the + PlanetWeb settings are non-existant) or >= 0 on success. You should check the + valid_fields bitfield for the part of the struct you want before relying on + the data. */ +int flashrom_get_pw_ispcfg(flashrom_ispcfg_t *out); + /* More to come later */ __END_DECLS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <los...@us...> - 2008-09-12 23:08:41
|
Revision: 607 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=607&view=rev Author: lostgeneration Date: 2008-09-12 19:18:31 +0000 (Fri, 12 Sep 2008) Log Message: ----------- Fixed GBA arch/types.h so cross compiler can be made. Modified Paths: -------------- kos/doc/CHANGELOG kos/kernel/arch/gba/include/arch/types.h Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-09-10 01:31:31 UTC (rev 606) +++ kos/doc/CHANGELOG 2008-09-12 19:18:31 UTC (rev 607) @@ -171,6 +171,7 @@ - DC Made vid_screen_shot support any of the video modes [DH] - *** Fixes to the network stack to support sending/receiving broadcast packets properly [LS] +- GBA Fixed arch/types.h so the toolchain can compile. [HL] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/kernel/arch/gba/include/arch/types.h =================================================================== --- kos/kernel/arch/gba/include/arch/types.h 2008-09-10 01:31:31 UTC (rev 606) +++ kos/kernel/arch/gba/include/arch/types.h 2008-09-12 19:18:31 UTC (rev 607) @@ -61,9 +61,11 @@ typedef unsigned short ushort; typedef unsigned int uint; +#if 0 /* File-specific types */ typedef size_t ssize_t; typedef size_t off_t; +#endif /* This type may be used for any generic handle type that is allowed to be negative (for errors) and has no specific bit count This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-09-10 01:31:34
|
Revision: 606 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=606&view=rev Author: ljsebald Date: 2008-09-10 01:31:31 +0000 (Wed, 10 Sep 2008) Log Message: ----------- A few changes in the network code to support sending/receiving broadcast packets properly. Also, catch all of 127.x.y.z as loopback addresses, as it is supposed to be. Modified Paths: -------------- kos/doc/CHANGELOG kos/include/kos/net.h kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c kos/kernel/net/net_icmp.c kos/kernel/net/net_ipv4.c Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-09-04 03:22:20 UTC (rev 605) +++ kos/doc/CHANGELOG 2008-09-10 01:31:31 UTC (rev 606) @@ -169,6 +169,8 @@ function_data of devinfo for that function has all the bits set that are set in the cap parameter [LS] - DC Made vid_screen_shot support any of the video modes [DH] +- *** Fixes to the network stack to support sending/receiving broadcast packets + properly [LS] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/include/kos/net.h =================================================================== --- kos/include/kos/net.h 2008-09-04 03:22:20 UTC (rev 605) +++ kos/include/kos/net.h 2008-09-10 01:31:31 UTC (rev 606) @@ -55,6 +55,9 @@ /* The device's gateway's IP address */ uint8 gateway[4]; + /* The device's broadcast address */ + uint8 broadcast[4]; + /* All of the following callback functions should return a negative value on failure, and a zero or positive value on success. Some functions have special values, as noted. */ Modified: kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c 2008-09-04 03:22:20 UTC (rev 605) +++ kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c 2008-09-10 01:31:31 UTC (rev 606) @@ -1015,6 +1015,7 @@ memcpy(bba_if.ip_addr, isp.ip, 4); memcpy(bba_if.netmask, isp.nm, 4); memcpy(bba_if.gateway, isp.gw, 4); + memcpy(bba_if.broadcast, isp.bc, 4); } /* Initialize */ Modified: kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c 2008-09-04 03:22:20 UTC (rev 605) +++ kos/kernel/arch/dreamcast/hardware/network/lan_adapter.c 2008-09-10 01:31:31 UTC (rev 606) @@ -649,6 +649,7 @@ memcpy(la_if.ip_addr, isp.ip, 4); memcpy(la_if.netmask, isp.nm, 4); memcpy(la_if.gateway, isp.gw, 4); + memcpy(la_if.broadcast, isp.bc, 4); } /* Initialize */ Modified: kos/kernel/net/net_icmp.c =================================================================== --- kos/kernel/net/net_icmp.c 2008-09-04 03:22:20 UTC (rev 605) +++ kos/kernel/net/net_icmp.c 2008-09-10 01:31:31 UTC (rev 606) @@ -90,15 +90,14 @@ /* Handle Echo (ICMP type 8) packets */ static void net_icmp_input_8(netif_t *src, ip_hdr_t *ip, icmp_hdr_t *icmp, const uint8 *d, int s) { - int i; - /* Set type to echo reply */ icmp->type = 0; - /* Swap source and dest ip addresses */ - i = ip->src; - ip->src = ip->dest; - ip->dest = i; + /* Set the destination to the original source, and substitute in our IP + for the src (done this way so that pings that are broadcasted get an + appropriate reply). */ + ip->dest = ip->src; + ip->src = htonl(net_ipv4_address(src->ip_addr)); /* Recompute the IP header checksum */ ip->checksum = 0; Modified: kos/kernel/net/net_ipv4.c =================================================================== --- kos/kernel/net/net_ipv4.c 2008-09-04 03:22:20 UTC (rev 605) +++ kos/kernel/net/net_ipv4.c 2008-09-10 01:31:31 UTC (rev 606) @@ -73,6 +73,18 @@ return 1; } +/* Determine if a given IP is the adapter's broadcast address. */ +static int is_broadcast(const uint8 dest[4], const uint8 bc[4]) { + int i; + + for(i = 0; i < 4; ++i) { + if(dest[i] != bc[i]) + return 0; + } + + return 1; +} + /* Send a packet on the specified network adapter */ int net_ipv4_send_packet(netif_t *net, ip_hdr_t *hdr, const uint8 *data, int size) { @@ -88,8 +100,8 @@ net_ipv4_parse_address(ntohl(hdr->dest), dest_ip); - /* Is this the loopback address (127.0.0.1)? */ - if(ntohl(hdr->dest) == 0x7F000001) { + /* Is this a loopback address (127/8)? */ + if((dest_ip[0] & 0xFF) == 0x7F) { /* Put the IP header / data into our packet */ memcpy(pkt, hdr, 4 * (hdr->version_ihl & 0x0f)); memcpy(pkt + 4 * (hdr->version_ihl & 0x0f), data, size); @@ -99,23 +111,30 @@ return 0; } - - /* Is it in our network? */ - if(!is_in_network(net->ip_addr, dest_ip, net->netmask)) { - memcpy(dest_ip, net->gateway, 4); + + /* Are we sending a broadcast packet? */ + if(hdr->dest == 0xFFFFFFFF || is_broadcast(dest_ip, net->broadcast)) { + /* Set the destination to the datalink layer broadcast address. */ + memset(dest_mac, 0xFF, 6); } + else { + /* Is it in our network? */ + if(!is_in_network(net->ip_addr, dest_ip, net->netmask)) { + memcpy(dest_ip, net->gateway, 4); + } - /* Get our destination's MAC address. If we do not have the MAC address - cached, return a distinguished error to the upper-level protocol so - that it can decide what to do. */ - err = net_arp_lookup(net, dest_ip, dest_mac); - if(err == -1) { - errno = ENETUNREACH; - return -1; + /* Get our destination's MAC address. If we do not have the MAC address + cached, return a distinguished error to the upper-level protocol so + that it can decide what to do. */ + err = net_arp_lookup(net, dest_ip, dest_mac); + if(err == -1) { + errno = ENETUNREACH; + return -1; + } + else if(err == -2) { + return -2; + } } - else if(err == -2) { - return -2; - } /* Fill in the ethernet header */ ehdr = (eth_hdr_t *)pkt; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-09-04 03:22:26
|
Revision: 605 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=605&view=rev Author: ljsebald Date: 2008-09-04 03:22:20 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Committing Donald Haase's vid_screen_shot patch (Tracker Item #2088266). Modified Paths: -------------- kos/doc/CHANGELOG kos/kernel/arch/dreamcast/util/screenshot.c Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-09-04 02:58:25 UTC (rev 604) +++ kos/doc/CHANGELOG 2008-09-04 03:22:20 UTC (rev 605) @@ -168,6 +168,7 @@ requested type and supports the list of capabilities listed (i.e, the function_data of devinfo for that function has all the bits set that are set in the cap parameter [LS] +- DC Made vid_screen_shot support any of the video modes [DH] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/kernel/arch/dreamcast/util/screenshot.c =================================================================== --- kos/kernel/arch/dreamcast/util/screenshot.c 2008-09-04 02:58:25 UTC (rev 604) +++ kos/kernel/arch/dreamcast/util/screenshot.c 2008-09-04 03:22:20 UTC (rev 605) @@ -2,6 +2,7 @@ screenshot.c (c)2002 Dan Potter + (c)2008 Donald Haase */ #include <stdio.h> @@ -11,8 +12,6 @@ #include <kos/fs.h> #include <arch/irq.h> -CVSID("$Id: screenshot.c,v 1.3 2003/02/14 08:13:18 bardtx Exp $"); - /* Provides a very simple screen shot facility (dumps raw RGB PPM files from the @@ -20,47 +19,90 @@ Destination file system must be writeable and have enough free space. -Assumes display is in 16-bit mode. +This will now work with any of the supported video modes. */ int vid_screen_shot(const char *destfn) { file_t f; - int i, bsize; + int i, numpix; uint8 *buffer; - uint16 pixel; - uint8 r, g, b; char header[256]; uint32 save; + uint32 pixel; /* to fit 888 mode */ + uint8 r, g, b; + uint8 bpp; + bpp = 3; /* output to ppm is 3 bytes per pixel */ + numpix = vid_mode->width * vid_mode->height; + /* Allocate a new buffer so we can blast it all at once */ - bsize = vid_mode->width * vid_mode->height * 3; - buffer = (uint8 *)malloc(bsize); + buffer = (uint8 *)malloc(numpix * bpp); if (buffer == NULL) { - dbglog(DBG_ERROR, "video_screen_shot: can't allocate ss memory\n"); + dbglog(DBG_ERROR, "vid_screen_shot: can't allocate ss memory\n"); return -1; } /* Disable interrupts */ save = irq_disable(); - /* Write out each 16-bit pixel as 24 bits */ - for (i=0; i<vid_mode->width*vid_mode->height; i++) { - pixel = vram_s[i]; - r = ((pixel >> 11) & 0x1f) << 3; - g = ((pixel >> 5) & 0x3f) << 2; - b = ((pixel >> 0) & 0x1f) << 3; - buffer[i*3+0] = r; - buffer[i*3+1] = g; - buffer[i*3+2] = b; - } + /* Write out each pixel as 24 bits */ + switch(vid_mode->pm) + { + case(PM_RGB555): + { + for (i = 0; i < numpix; i++) { + pixel = vram_s[i]; + r = (((pixel >> 10) & 0x1f) << 3); + b = (((pixel >> 5) & 0x1f) << 3); + g = (((pixel >> 0) & 0x1f) << 3); + buffer[i * 3 + 0] = r; + buffer[i * 3 + 1] = g; + buffer[i * 3 + 2] = b; + } + break; + } + case(PM_RGB565): + { + for (i = 0; i < numpix; i++) { + pixel = vram_s[i]; + r = (((pixel >> 11) & 0x1f) << 3); + b = (((pixel >> 5) & 0x3f) << 2); + g = (((pixel >> 0) & 0x1f) << 3); + buffer[i * 3 + 0] = r; + buffer[i * 3 + 1] = g; + buffer[i * 3 + 2] = b; + } + break; + } + case(PM_RGB888): + { + for (i = 0; i < numpix; i++) { + pixel = vram_l[i]; + r = (((pixel >> 16) & 0xff)); + b = (((pixel >> 8) & 0xff)); + g = (((pixel >> 0) & 0xff)); + buffer[i * 3 + 0] = r; + buffer[i * 3 + 1] = g; + buffer[i * 3 + 2] = b; + } + break; + } + default: + { + dbglog(DBG_ERROR, "vid_screen_shot: can't process pixel mode %d\n", vid_mode->pm); + irq_restore(save); + free(buffer); + return -1; + } + } irq_restore(save); /* Open output file */ f = fs_open(destfn, O_WRONLY | O_TRUNC); if (!f) { - dbglog(DBG_ERROR, "video_screen_shot: can't open output file '%s'\n", destfn); + dbglog(DBG_ERROR, "vid_screen_shot: can't open output file '%s'\n", destfn); free(buffer); return -1; } @@ -68,15 +110,15 @@ /* Write a small header */ sprintf(header, "P6\n#KallistiOS Screen Shot\n%d %d\n255\n", vid_mode->width, vid_mode->height); if (fs_write(f, header, strlen(header)) != strlen(header)) { - dbglog(DBG_ERROR, "video_screen_shot: can't write header to output file '%s'\n", destfn); + dbglog(DBG_ERROR, "vid_screen_shot: can't write header to output file '%s'\n", destfn); fs_close(f); free(buffer); return -1; } /* Write the data */ - if (fs_write(f, buffer, bsize) != (ssize_t)bsize) { - dbglog(DBG_ERROR, "video_screen_shot: can't write data to output file '%s'\n", destfn); + if (fs_write(f, buffer, numpix * bpp) != (ssize_t)(numpix * bpp)) { + dbglog(DBG_ERROR, "vid_screen_shot: can't write data to output file '%s'\n", destfn); fs_close(f); free(buffer); return -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-09-04 02:58:28
|
Revision: 604 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=604&view=rev Author: ljsebald Date: 2008-09-04 02:58:25 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Add maple_enum_type_ex function and capability defines for the controller to go along with it. Modified Paths: -------------- kos/doc/CHANGELOG kos/kernel/arch/dreamcast/hardware/maple/maple_enum.c kos/kernel/arch/dreamcast/include/dc/maple/controller.h kos/kernel/arch/dreamcast/include/dc/maple.h Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-08-30 19:52:37 UTC (rev 603) +++ kos/doc/CHANGELOG 2008-09-04 02:58:25 UTC (rev 604) @@ -164,6 +164,10 @@ previous sends [LS] - DC Rewrote microphone driver to make it support the different encodings available to the hardware [LS] +- DC Add maple_enum_type_ex function to return the nth device that is of the + requested type and supports the list of capabilities listed (i.e, the + function_data of devinfo for that function has all the bits set that are + set in the cap parameter [LS] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/kernel/arch/dreamcast/hardware/maple/maple_enum.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/maple/maple_enum.c 2008-08-30 19:52:37 UTC (rev 603) +++ kos/kernel/arch/dreamcast/hardware/maple/maple_enum.c 2008-09-04 02:58:25 UTC (rev 604) @@ -2,6 +2,7 @@ maple_enum.c (c)2002 Dan Potter + (c)2008 Lawrence Sebald */ #include <dc/maple.h> @@ -48,6 +49,52 @@ return NULL; } +/* Return the Nth device that is of the requested type and supports the list of + capabilities given. */ +maple_device_t * maple_enum_type_ex(int n, uint32 func, uint32 cap) { + int p, u, d; + maple_device_t *dev; + uint32 f, tmp; + + for(p = 0; p < MAPLE_PORT_COUNT; ++p) { + for(u = 0; u < MAPLE_UNIT_COUNT; ++u) { + dev = maple_enum_dev(p, u); + + /* If the device supports the function code we passed in, check + if it supports the capabilities that the user requested. */ + if(dev != NULL && (dev->info.functions & func)) { + f = dev->info.functions; + d = 0; + tmp = func; + + /* Figure out which function data we want to look at. Function + data entries are arranged by the function code, most + significant bit first. This is really not pretty, and is + rather inefficient, but its the best I could think of off the + top of my head (i.e, replace me later). */ + while(tmp != 0x80000000) { + if(f & 0x80000000) { + ++d; + } + + f <<= 1; + tmp <<= 1; + } + + /* Check if the function data for the function type checks out + with what it should be. */ + if((dev->info.function_data[d] & cap) == cap) { + if(!n) + return dev; + --n; + } + } + } + } + + return NULL; +} + /* Get the status struct for the requested maple device; wait until it's valid before returning. Cast to the appropriate type you're expecting. */ void * maple_dev_status(maple_device_t *dev) { Modified: kos/kernel/arch/dreamcast/include/dc/maple/controller.h =================================================================== --- kos/kernel/arch/dreamcast/include/dc/maple/controller.h 2008-08-30 19:52:37 UTC (rev 603) +++ kos/kernel/arch/dreamcast/include/dc/maple/controller.h 2008-09-04 02:58:25 UTC (rev 604) @@ -75,6 +75,32 @@ typedef void (*cont_btn_callback_t)(uint8 addr, uint32 btns); void cont_btn_callback(uint8 addr, uint32 btns, cont_btn_callback_t cb); +/* Capability bits - These will be set in the function_data for the controller + in the reply to the devinfo command if the controller supports the + corresponding feature. */ +#define CONT_CAPABILITY_C (1<<0) +#define CONT_CAPABILITY_B (1<<1) +#define CONT_CAPABILITY_A (1<<2) +#define CONT_CAPABILITY_START (1<<3) +#define CONT_CAPABILITY_DPAD_UP (1<<4) +#define CONT_CAPABILITY_DPAD_DOWN (1<<5) +#define CONT_CAPABILITY_DPAD_LEFT (1<<6) +#define CONT_CAPABILITY_DPAD_RIGHT (1<<7) +#define CONT_CAPABILITY_Z (1<<8) +#define CONT_CAPABILITY_Y (1<<9) +#define CONT_CAPABILITY_X (1<<10) +#define CONT_CAPABILITY_D (1<<11) +#define CONT_CAPABILITY_DPAD2_UP (1<<12) +#define CONT_CAPABILITY_DPAD2_DOWN (1<<13) +#define CONT_CAPABILITY_DPAD2_LEFT (1<<14) +#define CONT_CAPABILITY_DPAD2_RIGHT (1<<15) +#define CONT_CAPABILITY_RTRIG (1<<16) +#define CONT_CAPABILITY_LTRIG (1<<17) +#define CONT_CAPABILITY_ANALOG_X (1<<18) +#define CONT_CAPABILITY_ANALOG_Y (1<<19) +#define CONT_CAPABILITY_ANALOG2_X (1<<20) +#define CONT_CAPABILITY_ANALOG2_Y (1<<21) + __END_DECLS #endif /* __DC_MAPLE_CONTROLLER_H */ Modified: kos/kernel/arch/dreamcast/include/dc/maple.h =================================================================== --- kos/kernel/arch/dreamcast/include/dc/maple.h 2008-08-30 19:52:37 UTC (rev 603) +++ kos/kernel/arch/dreamcast/include/dc/maple.h 2008-09-04 02:58:25 UTC (rev 604) @@ -341,6 +341,13 @@ /* Return the Nth device of the requested type (where N is zero-indexed) */ maple_device_t * maple_enum_type(int n, uint32 func); +/* Return the Nth device that is of the requested type and supports the list of + capabilities given. Note, this only currently makes sense for controllers, + since some devices don't necessarily use the function data in the same manner + that controllers do (and controllers are the only devices where we have a + list of what all the bits mean at the moment). */ +maple_device_t * maple_enum_type_ex(int n, uint32 func, uint32 cap); + /* Get the status struct for the requested maple device; wait until it's valid before returning. Cast to the appropriate type you're expecting. */ void * maple_dev_status(maple_device_t *dev); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-08-30 19:52:42
|
Revision: 603 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=603&view=rev Author: ljsebald Date: 2008-08-30 19:52:37 +0000 (Sat, 30 Aug 2008) Log Message: ----------- Adding in rewritten microphone driver that now supports more than just the 16-bit signed @ 11025Hz encoding for samples. Modified Paths: -------------- kos/doc/CHANGELOG kos/kernel/arch/dreamcast/hardware/maple/sip.c kos/kernel/arch/dreamcast/include/dc/maple/sip.h Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-08-18 00:08:44 UTC (rev 602) +++ kos/doc/CHANGELOG 2008-08-30 19:52:37 UTC (rev 603) @@ -162,6 +162,8 @@ - DC If a packet is < 60 bytes, pad it with null bytes for clarity, rather than just transmitting whatever random junk was in the transmit buffer from previous sends [LS] +- DC Rewrote microphone driver to make it support the different encodings + available to the hardware [LS] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/kernel/arch/dreamcast/hardware/maple/sip.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/maple/sip.c 2008-08-18 00:08:44 UTC (rev 602) +++ kos/kernel/arch/dreamcast/hardware/maple/sip.c 2008-08-30 19:52:37 UTC (rev 603) @@ -1,279 +1,402 @@ /* KallistiOS ##version## sip.c - Copyright (C) 2005 Lawrence Sebald + Copyright (C) 2005, 2008 Lawrence Sebald */ #include <assert.h> #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <arch/irq.h> #include <kos/genwait.h> #include <dc/maple.h> #include <dc/maple/sip.h> -static void sip_generic_cb(maple_frame_t *frame) { - /* Unlock the frame */ - maple_frame_unlock(frame); - - /* Wake up! */ - genwait_wake_all(frame); +#define SIP_START_SAMPLING 0x80 + +static void sip_start_sampling_cb(maple_frame_t *frame) { + sip_state_t *sip; + maple_response_t *resp; + + /* Unlock the frame */ + maple_frame_unlock(frame); + + /* Make sure we got a valid response */ + resp = (maple_response_t *)frame->recv_buf; + + if(resp->response != MAPLE_RESPONSE_OK) + return; + + /* Set the is_sampling flag. */ + sip = (sip_state_t *)frame->dev->status; + sip->is_sampling = 1; + + /* Wake up! */ + genwait_wake_all(frame); } -int sip_set_gain(maple_device_t *dev, uint8 g) { - sip_state_t *sip; +static void sip_stop_sampling_cb(maple_frame_t *frame) { + sip_state_t *sip; + maple_response_t *resp; - assert( dev != NULL ); - - sip = (sip_state_t *)dev->status; + /* Unlock the frame */ + maple_frame_unlock(frame); - /* Check the gain value for validity */ - if(g > 0x1F) - return MAPLE_EINVALID; + /* Make sure we got a valid response */ + resp = (maple_response_t *)frame->recv_buf; - sip->amp_gain = g; + if(resp->response != MAPLE_RESPONSE_OK) + return; - return MAPLE_EOK; + /* Clear the is_sampling flag. */ + sip = (sip_state_t *)frame->dev->status; + sip->is_sampling = 0; + + /* Wake up! */ + genwait_wake_all(frame); } -int sip_start_sampling(maple_device_t *dev) { - sip_state_t *sip; - uint32 *send_buf; - - assert( dev != NULL ); - - sip = (sip_state_t *)dev->status; - - /* Make sure we aren't yet sampling */ - if(sip->is_sampling) - return MAPLE_EFAIL; - - /* Lock the frame */ - if(maple_frame_lock(&dev->frame) < 0) - return MAPLE_EAGAIN; - - /* Reset the frame */ - maple_frame_init(&dev->frame); - send_buf = (uint32 *)dev->frame.recv_buf; - send_buf[0] = MAPLE_FUNC_MICROPHONE; - send_buf[1] = 0x02 | (0x80 << 8); /* Start sampling */ - dev->frame.cmd = MAPLE_COMMAND_MICCONTROL; - dev->frame.dst_port = dev->port; - dev->frame.dst_unit = dev->unit; - dev->frame.length = 2; - dev->frame.callback = sip_generic_cb; - dev->frame.send_buf = send_buf; - maple_queue_frame(&dev->frame); - - /* Wait for the SIP to accept it */ - if(genwait_wait(&dev->frame, "sip_start_sampling", 500, NULL) < 0) { - if(dev->frame.state != MAPLE_FRAME_VACANT) { - /* Something went wrong.... */ - dev->frame.state = MAPLE_FRAME_VACANT; - dbglog(DBG_ERROR, "sip_start_sampling: timeout to unit %c%c\n", - dev->port + 'A', dev->unit + '0'); - return MAPLE_ETIMEOUT; - } - } - - sip->is_sampling = 1; - - return MAPLE_EOK; +int sip_set_gain(maple_device_t *dev, unsigned int g) { + sip_state_t *sip; + + assert( dev != NULL ); + + /* Check the gain value for validity */ + if(g > SIP_MAX_GAIN) + return MAPLE_EINVALID; + + sip = (sip_state_t *)dev->status; + sip->amp_gain = g; + + return MAPLE_EOK; } -int sip_stop_sampling(maple_device_t *dev) { - sip_state_t *sip; - uint32 *send_buf; +int sip_set_sample_type(maple_device_t *dev, unsigned int type) { + sip_state_t *sip; - assert( dev != NULL ); + assert( dev != NULL ); - sip = (sip_state_t *)dev->status; + /* Check the sample type value for validity. */ + if(type > SIP_SAMPLE_8BIT_ULAW) + return MAPLE_EINVALID; - /* Make sure we actually are sampling */ - if(!sip->is_sampling) - return MAPLE_EFAIL; + sip = (sip_state_t *)dev->status; - /* Lock the frame */ - if(maple_frame_lock(&dev->frame) < 0) - return MAPLE_EAGAIN; + /* Make sure we aren't sampling already. */ + if(sip->is_sampling) + return MAPLE_EFAIL; - /* Reset the frame */ - maple_frame_init(&dev->frame); - send_buf = (uint32 *)dev->frame.recv_buf; - send_buf[0] = MAPLE_FUNC_MICROPHONE; - send_buf[1] = 0x02; /* Stop sampling */ - dev->frame.cmd = MAPLE_COMMAND_MICCONTROL; - dev->frame.dst_port = dev->port; - dev->frame.dst_unit = dev->unit; - dev->frame.length = 2; - dev->frame.callback = sip_generic_cb; - dev->frame.send_buf = send_buf; - maple_queue_frame(&dev->frame); + sip->sample_type = type; - /* Wait for the SIP to accept it */ - if(genwait_wait(&dev->frame, "sip_stop_sampling", 500, NULL) < 0) { - if(dev->frame.state != MAPLE_FRAME_VACANT) { - /* Something went wrong.... */ - dev->frame.state = MAPLE_FRAME_VACANT; - dbglog(DBG_ERROR, "sip_stop_sampling: timeout to unit %c%c\n", - dev->port + 'A', dev->unit + '0'); - return MAPLE_ETIMEOUT; - } - } + return MAPLE_EOK; +} - sip->is_sampling = 0; +int sip_set_frequency(maple_device_t *dev, unsigned int freq) { + sip_state_t *sip; - return MAPLE_EOK; + assert( dev != NULL ); + + /* Check the frequency value for validity. */ + if(freq > SIP_SAMPLE_8KHZ) + return MAPLE_EINVALID; + + sip = (sip_state_t *)dev->status; + + /* Make sure we aren't sampling already. */ + if(sip->is_sampling) + return MAPLE_EFAIL; + + sip->frequency = freq; + + return MAPLE_EOK; } -int sip_get_samples(maple_device_t *dev, uint8 *buf, size_t len) { - sip_state_t *sip; - size_t sz; +int sip_start_sampling(maple_device_t *dev, int block) { + sip_state_t *sip; + uint32 *send_buf; - sip = (sip_state_t *)dev->status; + assert( dev != NULL ); - if(sip->is_sampling) - return MAPLE_EFAIL; + sip = (sip_state_t *)dev->status; - sz = sip->buf_pos > len ? len : sip->buf_pos; + /* Make sure we aren't yet sampling */ + if(sip->is_sampling) + return MAPLE_EFAIL; - memcpy(buf, sip->samples_buf, sz); + /* Lock the frame */ + if(maple_frame_lock(&dev->frame) < 0) + return MAPLE_EAGAIN; - if(sz == sip->buf_pos) { - sip->buf_pos = 0; - } - else { - memcpy(sip->samples_buf + sz, sip->samples_buf, sip->buf_pos - sz); - sip->buf_pos -= sz; - } + /* Reset the frame */ + maple_frame_init(&dev->frame); + send_buf = (uint32 *)dev->frame.recv_buf; + send_buf[0] = MAPLE_FUNC_MICROPHONE; + send_buf[1] = SIP_SUBCOMMAND_BASIC_CTRL | + (((sip->sample_type) | (sip->frequency << 2) | + SIP_START_SAMPLING) << 8); + dev->frame.cmd = MAPLE_COMMAND_MICCONTROL; + dev->frame.dst_port = dev->port; + dev->frame.dst_unit = dev->unit; + dev->frame.length = 2; + dev->frame.callback = sip_start_sampling_cb; + dev->frame.send_buf = send_buf; + maple_queue_frame(&dev->frame); - return sz; + if(block) { + /* Wait for the SIP to accept it */ + if(genwait_wait(&dev->frame, "sip_start_sampling", 500, NULL) < 0) { + if(dev->frame.state != MAPLE_FRAME_VACANT) { + /* Something went wrong.... */ + dev->frame.state = MAPLE_FRAME_VACANT; + dbglog(DBG_ERROR, "sip_start_sampling: timeout to unit %c%c\n", + dev->port + 'A', dev->unit + '0'); + return MAPLE_ETIMEOUT; + } + } + } + + return MAPLE_EOK; } -int sip_clear_samples(maple_device_t *dev) { - sip_state_t *sip; +int sip_stop_sampling(maple_device_t *dev, int block) { + sip_state_t *sip; + uint32 *send_buf; - sip = (sip_state_t *)dev->status; + assert( dev != NULL ); - if(sip->is_sampling) - return MAPLE_EFAIL; + sip = (sip_state_t *)dev->status; - sip->buf_pos = 0; + /* Make sure we actually are sampling */ + if(!sip->is_sampling) + return MAPLE_EFAIL; - return MAPLE_EOK; + /* Lock the frame */ + if(maple_frame_lock(&dev->frame) < 0) + return MAPLE_EAGAIN; + + /* Reset the frame */ + maple_frame_init(&dev->frame); + send_buf = (uint32 *)dev->frame.recv_buf; + send_buf[0] = MAPLE_FUNC_MICROPHONE; + send_buf[1] = SIP_SUBCOMMAND_BASIC_CTRL; + dev->frame.cmd = MAPLE_COMMAND_MICCONTROL; + dev->frame.dst_port = dev->port; + dev->frame.dst_unit = dev->unit; + dev->frame.length = 2; + dev->frame.callback = sip_stop_sampling_cb; + dev->frame.send_buf = send_buf; + maple_queue_frame(&dev->frame); + + if(block) { + /* Wait for the SIP to accept it */ + if(genwait_wait(&dev->frame, "sip_stop_sampling", 500, NULL) < 0) { + if(dev->frame.state != MAPLE_FRAME_VACANT) { + /* Something went wrong.... */ + dev->frame.state = MAPLE_FRAME_VACANT; + dbglog(DBG_ERROR, "sip_stop_sampling: timeout to unit %c%c\n", + dev->port + 'A', dev->unit + '0'); + return MAPLE_ETIMEOUT; + } + } + } + + return MAPLE_EOK; } -static void sip_reply(maple_frame_t *frm) { - maple_response_t *resp; - uint32 *respbuf; - size_t sz, i; - sip_state_t *sip; - - /* Unlock the frame now (it's ok, we're in an IRQ) */ - maple_frame_unlock(frm); - - /* Make sure we got a valid response */ - resp = (maple_response_t *)frm->recv_buf; - - if (resp->response != MAPLE_RESPONSE_DATATRF) - return; - respbuf = (uint32 *)resp->data; - if (respbuf[0] != MAPLE_FUNC_MICROPHONE) - return; - - if(frm->dev) { - sip = (sip_state_t *)frm->dev->status; - frm->dev->status_valid = 1; +uint8 *sip_get_samples(maple_device_t *dev, size_t *sz) { + sip_state_t *sip; + uint8 *rv; + uint32 old; - if(sip->is_sampling) { - sz = resp->data_len * 4 - 8; + assert( dev != NULL ); + assert( sz != NULL ); - /* Make sure we don't overflow the buffer */ - if(sz + sip->buf_pos <= sip->buf_len) { - for(i = 0; i < sz; i++) { - sip->samples_buf[i + sip->buf_pos] = resp->data[i + 8]; - } - sip->buf_pos += sz; - } - } - } + /* Disable interrupts so that nothing changes underneath us. */ + old = irq_disable(); + + sip = (sip_state_t *)dev->status; + + /* Make sure that we're not currently sampling. */ + if(sip->is_sampling) { + irq_restore(old); + *sz = (size_t)-1; + return NULL; + } + + /* Grab the values to return. */ + *sz = sip->buf_pos; + rv = sip->samples_buf; + + /* Allocate us a new buffer. */ + sip->buf_pos = 0; + sip->samples_buf = (uint8 *)malloc(11025 * 2 * 10); + + if(sip->samples_buf == NULL) { + sip->buf_len = 0; + dev->status_valid = 0; + } + else { + sip->buf_len = 11025 * 2 * 10; + dev->status_valid = 1; + } + + irq_restore(old); + return rv; } +int sip_clear_samples(maple_device_t *dev) { + sip_state_t *sip; + uint32 old; -static int sip_poll(maple_device_t *dev) { - sip_state_t *sip; - uint32 *send_buf; + assert( dev != NULL ); - /* Test to make sure that the particular mic is enabled */ - sip = (sip_state_t *)dev->status; + /* Disable IRQs so that nothing changes under us */ + old = irq_disable(); - /* Lock the frame, or die trying */ - if(maple_frame_lock(&dev->frame) < 0) - return 0; + sip = (sip_state_t *)dev->status; - maple_frame_init(&dev->frame); - send_buf = (uint32 *)dev->frame.recv_buf; - send_buf[0] = MAPLE_FUNC_MICROPHONE; - send_buf[1] = 0x01 | (sip->amp_gain << 8); /* Get samples/status */ - dev->frame.cmd = MAPLE_COMMAND_MICCONTROL; - dev->frame.dst_port = dev->port; - dev->frame.dst_unit = dev->unit; - dev->frame.length = 2; - dev->frame.callback = sip_reply; - dev->frame.send_buf = send_buf; - maple_queue_frame(&dev->frame); + if(sip->is_sampling) { + irq_restore(old); + return MAPLE_EFAIL; + } - return 0; + sip->buf_pos = 0; + + irq_restore(old); + + return MAPLE_EOK; } +static void sip_reply(maple_frame_t *frm) { + maple_response_t *resp; + uint32 *respbuf; + size_t sz; + sip_state_t *sip; + void *tmp; + + /* Unlock the frame now (it's ok, we're in an IRQ) */ + maple_frame_unlock(frm); + + /* Make sure we got a valid response */ + resp = (maple_response_t *)frm->recv_buf; + + if(resp->response != MAPLE_RESPONSE_DATATRF) + return; + + respbuf = (uint32 *)resp->data; + + if(respbuf[0] != MAPLE_FUNC_MICROPHONE) + return; + + if(frm->dev) { + sip = (sip_state_t *)frm->dev->status; + frm->dev->status_valid = 1; + + if(sip->is_sampling) { + sz = resp->data_len * 4 - 8; + + /* Resize the buffer, if it is needed. */ + if(sz + sip->buf_pos > sip->buf_len) { + /* Attempt to double the buffer size. */ + tmp = realloc(sip->samples_buf, sip->buf_len << 1); + + if(!tmp) { + return; + } + + sip->samples_buf = tmp; + sip->buf_len <<= 1; + } + + memcpy(sip->samples_buf + sip->buf_pos, resp->data + 8, sz); + sip->buf_pos += sz; + } + } +} + +static int sip_poll(maple_device_t *dev) { + sip_state_t *sip; + uint32 *send_buf; + + sip = (sip_state_t *)dev->status; + + /* Test to make sure that the particular mic is enabled */ + if(!sip->is_sampling) { + return 0; + } + + /* Lock the frame, or die trying */ + if(maple_frame_lock(&dev->frame) < 0) + return 0; + + maple_frame_init(&dev->frame); + send_buf = (uint32 *)dev->frame.recv_buf; + send_buf[0] = MAPLE_FUNC_MICROPHONE; + send_buf[1] = SIP_SUBCOMMAND_GET_SAMPLES | + (sip->amp_gain << 8); + dev->frame.cmd = MAPLE_COMMAND_MICCONTROL; + dev->frame.dst_port = dev->port; + dev->frame.dst_unit = dev->unit; + dev->frame.length = 2; + dev->frame.callback = sip_reply; + dev->frame.send_buf = send_buf; + maple_queue_frame(&dev->frame); + + return 0; +} + static void sip_periodic(maple_driver_t *drv) { - maple_driver_foreach(drv, sip_poll); + maple_driver_foreach(drv, sip_poll); } static int sip_attach(maple_driver_t *drv, maple_device_t *dev) { - sip_state_t *sip; + sip_state_t *sip; - /* Allocate the sample buffer for 10 seconds worth of samples */ - sip = (sip_state_t *)dev->status; - sip->is_sampling = 0; - sip->amp_gain = 0; - sip->buf_pos = 0; - sip->samples_buf = (uint8 *)malloc(11025 * 2 * 10); + /* Allocate the sample buffer for 10 seconds worth of samples (11.025kHz, + 16-bit signed samples). */ + sip = (sip_state_t *)dev->status; + sip->is_sampling = 0; + sip->amp_gain = SIP_DEFAULT_GAIN; + sip->buf_pos = 0; + sip->samples_buf = (uint8 *)malloc(11025 * 2 * 10); - if(sip->samples_buf == NULL) { - dev->status_valid = 0; - sip->buf_len = 0; - return -1; - } - else { - dev->status_valid = 1; - sip->buf_len = 11025 * 2 * 10; - return 0; - } + if(sip->samples_buf == NULL) { + dev->status_valid = 0; + sip->buf_len = 0; + return -1; + } + else { + dev->status_valid = 1; + sip->buf_len = 11025 * 2 * 10; + return 0; + } } static void sip_detach(maple_driver_t *drv, maple_device_t *dev) { - sip_state_t *sip; + sip_state_t *sip; - sip = (sip_state_t *)dev->status; - free(sip->samples_buf); + sip = (sip_state_t *)dev->status; + + if(sip->samples_buf) { + free(sip->samples_buf); + } } /* Device Driver Struct */ static maple_driver_t sip_drv = { - functions: MAPLE_FUNC_MICROPHONE, - name: "Sound Input Peripheral", - periodic: sip_periodic, - attach: sip_attach, - detach: sip_detach + functions: MAPLE_FUNC_MICROPHONE, + name: "Sound Input Peripheral", + periodic: sip_periodic, + attach: sip_attach, + detach: sip_detach }; /* Add the SIP to the driver chain */ int sip_init() { - return maple_driver_reg(&sip_drv); + return maple_driver_reg(&sip_drv); } void sip_shutdown() { - maple_driver_unreg(&sip_drv); + maple_driver_unreg(&sip_drv); } - Modified: kos/kernel/arch/dreamcast/include/dc/maple/sip.h =================================================================== --- kos/kernel/arch/dreamcast/include/dc/maple/sip.h 2008-08-18 00:08:44 UTC (rev 602) +++ kos/kernel/arch/dreamcast/include/dc/maple/sip.h 2008-08-30 19:52:37 UTC (rev 603) @@ -1,7 +1,7 @@ /* KallistiOS ##version## dc/maple/sip.h - Copyright (C) 2005 Lawrence Sebald + Copyright (C) 2005, 2008 Lawrence Sebald */ @@ -13,40 +13,75 @@ #include <sys/types.h> -/* This driver controls the Sound Input Peripheral for the maple - bus (the microphone). Many thanks go out to ZeZu for pointing - me towards what some commands actually do. +/* This driver controls the Sound Input Peripheral for the maple bus (aka, the + microphone that came with Seaman and the Dreameye). Many thanks go out to + ZeZu for pointing me towards what some commands actually do in the original + version of this driver. */ -/* SIP Status structure */ +/* SIP Status structure. Everything in here should be considered to be read-only + from user programs. */ typedef struct sip_state { - uint8 amp_gain; - uint8 is_sampling; - size_t buf_len; - off_t buf_pos; - uint8 *samples_buf; + int amp_gain; + int sample_type; + int frequency; + int is_sampling; + size_t buf_len; + off_t buf_pos; + uint8 *samples_buf; } sip_state_t; -/* The maximum gain value to be passed to the function - below. */ -#define SIP_MAX_GAIN 0x1F +/* Subcommands of the Microphone command. */ +#define SIP_SUBCOMMAND_GET_SAMPLES 0x01 +#define SIP_SUBCOMMAND_BASIC_CTRL 0x02 -/* Set the amplifier's gain. This should only be called prior - to sampling, to ensure that the sound returned is of the - same volume. */ -int sip_set_gain(maple_device_t *dev, uint8 g); +/* The minimum, maximum, and default gain values that can be passed to the + sip_set_gain function. */ +#define SIP_MIN_GAIN 0x00 +#define SIP_DEFAULT_GAIN 0x0F +#define SIP_MAX_GAIN 0x1F -/* Start sampling. */ -int sip_start_sampling(maple_device_t *dev); +/* Set the amplifier's gain. This should only be called prior to sampling, to + ensure that the sound returned is of the same volume (unlike the other + functions below, this is not strictly a requirement, as this gets sent + with all of the get samples packets). */ +int sip_set_gain(maple_device_t *dev, unsigned int g); -/* Stop sampling. */ -int sip_stop_sampling(maple_device_t *dev); +/* Sample types. These two values are the only defined types of samples that + the SIP can output. 16-bit signed is your standard 16-bit signed samples, + where 8-bit ulaw is obvously encoded as ulaw. */ +#define SIP_SAMPLE_16BIT_SIGNED 0x00 +#define SIP_SAMPLE_8BIT_ULAW 0x01 -/* Get samples out of the buffer. This can ONLY be called after - sampling has been stopped. Returns the size in bytes of the - filled buffer. */ -int sip_get_samples(maple_device_t *dev, uint8 *buf, size_t len); +/* Set the sample type to be returned by the microphone. This must be called + prior to a sip_start_sampling if you want to change it from the default + (16-bit signed is the default). */ +int sip_set_sample_type(maple_device_t *dev, unsigned int type); +/* Sampling frequencies. The SIP supports sampling at either 8kHz or 11.025 kHz. + One of these values should be passed to the sip_set_frequency function. */ +#define SIP_SAMPLE_11KHZ 0x00 +#define SIP_SAMPLE_8KHZ 0x01 + +/* Set the sampling frequency to be returned by the microphone. This must be + called prior to a sip_start_sampling if you want to change it from the + default (11kHz is the default). */ +int sip_set_frequency(maple_device_t *dev, unsigned int freq); + +/* Start sampling. If you want the function to block until sampling has started, + set the block argument to something other than zero. Otherwise, check the + is_sampling member of the device status to know when sampling has started. */ +int sip_start_sampling(maple_device_t *dev, int block); + +/* Stop sampling. Same comment about blocking above applies here too. */ +int sip_stop_sampling(maple_device_t *dev, int block); + +/* Grab the samples buffer from the device. This function can only be called + when the microphone is not sampling. Once you call this function, you are + responsible for the buffer, so you must free it when you're done. The sz + pointer is used to return how long the sample data is. */ +uint8 *sip_get_samples(maple_device_t *dev, size_t *sz); + /* Clear the internal sample buffer. */ int sip_clear_samples(maple_device_t *dev); @@ -57,4 +92,3 @@ __END_DECLS #endif /* __DC_MAPLE_SIP_H */ - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2008-08-18 00:08:45
|
Revision: 602 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=602&view=rev Author: fackue Date: 2008-08-18 00:08:44 +0000 (Mon, 18 Aug 2008) Log Message: ----------- Fixed Applied patch Modified Paths: -------------- kos-ports/libtga/tga.c Modified: kos-ports/libtga/tga.c =================================================================== --- kos-ports/libtga/tga.c 2008-08-17 23:50:39 UTC (rev 601) +++ kos-ports/libtga/tga.c 2008-08-18 00:08:44 UTC (rev 602) @@ -37,7 +37,7 @@ /* Loads a TGA file into a kos_img_t struct */ int tga_to_img(const char *fn, kos_img_t *rv) { tga_hdr tgah; - file fd; + file_t fd; uint8 r, g, b, a; int x, y; int num_bytes; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2008-08-17 23:50:42
|
Revision: 601 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=601&view=rev Author: fackue Date: 2008-08-17 23:50:39 +0000 (Sun, 17 Aug 2008) Log Message: ----------- Applying patch for libtga mailed in from mailing list. Modified Paths: -------------- kos-ports/libtga/tga.c Modified: kos-ports/libtga/tga.c =================================================================== --- kos-ports/libtga/tga.c 2008-07-25 06:09:39 UTC (rev 600) +++ kos-ports/libtga/tga.c 2008-08-17 23:50:39 UTC (rev 601) @@ -37,7 +37,7 @@ /* Loads a TGA file into a kos_img_t struct */ int tga_to_img(const char *fn, kos_img_t *rv) { tga_hdr tgah; - uint32 fd; + file fd; uint8 r, g, b, a; int x, y; int num_bytes; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-07-25 06:09:41
|
Revision: 600 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=600&view=rev Author: ljsebald Date: 2008-07-25 06:09:39 +0000 (Fri, 25 Jul 2008) Log Message: ----------- - Add g2_memset_8 function. - Handle misaligned outgoing packets in the bba driver. - Pad small packets with NULL bytes, rather than whatever junk is in the bba's tx buffer. Modified Paths: -------------- kos/doc/CHANGELOG kos/kernel/arch/dreamcast/hardware/g2bus.c kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c kos/kernel/arch/dreamcast/include/dc/g2bus.h Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-06-23 23:42:13 UTC (rev 599) +++ kos/doc/CHANGELOG 2008-07-25 06:09:39 UTC (rev 600) @@ -157,6 +157,11 @@ - *** Moved checking for free(NULL) up in code to avoid potential problems [HL] - DC fs_ramdisk.c: Don't allow opening a file with O_DIR [CG] - *** Removed legacy libc and libm [HL] +- DC Handle potentially misaligned outgoing packets in the BBA driver [LS] +- DC Added g2_memset_8 function for doing a memset over G2 with locking [LS] +- DC If a packet is < 60 bytes, pad it with null bytes for clarity, rather than + just transmitting whatever random junk was in the transmit buffer from + previous sends [LS] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/kernel/arch/dreamcast/hardware/g2bus.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/g2bus.c 2008-06-23 23:42:13 UTC (rev 599) +++ kos/kernel/arch/dreamcast/hardware/g2bus.c 2008-07-25 06:09:39 UTC (rev 600) @@ -201,6 +201,20 @@ G2_UNLOCK(old1, old2); } +/* A memset-like function for G2 */ +void g2_memset_8(uint32 address, uint8 c, int amt) { + vuint8 * output = (vuint8 *)address; + int old1, old2; + + G2_LOCK(old1, old2); + + while (amt--) { + *output++ = c; + } + + G2_UNLOCK(old1, old2); +} + /* When writing to the SPU RAM, this is required at least every 8 32-bit writes that you execute */ void g2_fifo_wait() { Modified: kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c =================================================================== --- kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c 2008-06-23 23:42:13 UTC (rev 599) +++ kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c 2008-07-25 06:09:39 UTC (rev 600) @@ -4,7 +4,7 @@ Copyright (C)2001,2003,2005 Dan Potter Copyright (C)2004 Vincent Penne - Copyright (C)2007 Lawrence Sebald + Copyright (C)2007, 2008 Lawrence Sebald */ @@ -647,12 +647,25 @@ //g2_write_block_8(pkt, txdesc[rtl.cur_tx], len); - /* VP : g2_write_block_32 works here, use it , it's faster ! */ - g2_write_block_32((uint32 *) pkt, txdesc[rtl.cur_tx], (len + 3) >> 2); + /* Check alignment of the packet, if its 32-bit aligned, use + g2_write_block_32, if its 16-bit aligned, use g2_write_block_16, + otherwise, use g2_write_block_8. */ + if(!((uint32)pkt & 0x03)) { + g2_write_block_32((uint32 *) pkt, txdesc[rtl.cur_tx], (len + 3) >> 2); + } + else if(!((uint32)pkt & 0x01)) { + g2_write_block_16((uint16 *) pkt, txdesc[rtl.cur_tx], (len + 1) >> 1); + } + else { + g2_write_block_8(pkt, txdesc[rtl.cur_tx], len); + } - /* All packets must be at least 60 bytes */ - if (len < 60) + /* All packets must be at least 60 bytes, pad them with null bytes if + they are not already of an appropriate size. */ + if (len < 60) { + g2_memset_8(txdesc[rtl.cur_tx] + len, 0, 60 - len); len = 60; + } /* Transmit from the current TX buffer */ g2_write_32(NIC(RT_TXSTATUS0 + 4 * rtl.cur_tx), len); @@ -988,20 +1001,20 @@ /* Set ISP configuration from the flashrom, as long as we're configured staticly */ static void bba_set_ispcfg() { - flashrom_ispcfg_t isp; + flashrom_ispcfg_t isp; - if(flashrom_get_ispcfg(&isp) == -1) - return; + if(flashrom_get_ispcfg(&isp) == -1) + return; - if(!isp.ip_valid) - return; + if(!isp.ip_valid) + return; - if(isp.method != FLASHROM_ISP_STATIC) - return; + if(isp.method != FLASHROM_ISP_STATIC) + return; - memcpy(bba_if.ip_addr, isp.ip, 4); - memcpy(bba_if.netmask, isp.nm, 4); - memcpy(bba_if.gateway, isp.gw, 4); + memcpy(bba_if.ip_addr, isp.ip, 4); + memcpy(bba_if.netmask, isp.nm, 4); + memcpy(bba_if.gateway, isp.gw, 4); } /* Initialize */ @@ -1040,8 +1053,8 @@ bba_if.if_rx_poll = bba_if_rx_poll; bba_if.if_set_flags = bba_if_set_flags; - /* Attempt to set up our IP address et al from the flashrom */ - bba_set_ispcfg(); + /* Attempt to set up our IP address et al from the flashrom */ + bba_set_ispcfg(); #if 0 /* Try to detect/init us */ Modified: kos/kernel/arch/dreamcast/include/dc/g2bus.h =================================================================== --- kos/kernel/arch/dreamcast/include/dc/g2bus.h 2008-06-23 23:42:13 UTC (rev 599) +++ kos/kernel/arch/dreamcast/include/dc/g2bus.h 2008-07-25 06:09:39 UTC (rev 600) @@ -93,6 +93,9 @@ /* Write a block of 32-bit values to G2 */ void g2_write_block_32(const uint32 * input, uint32 address, int amt); +/* memset(), but for use on G2. */ +void g2_memset_8(uint32 address, uint8 c, int amt); + /* When writing to the SPU RAM, this is required at least every 8 32-bit writes that you execute */ void g2_fifo_wait(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <los...@us...> - 2008-06-23 23:42:14
|
Revision: 599 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=599&view=rev Author: lostgeneration Date: 2008-06-23 16:42:13 -0700 (Mon, 23 Jun 2008) Log Message: ----------- I should probably try to remember to update the CHANGELOG with every commit Modified Paths: -------------- kos/doc/CHANGELOG Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-06-23 22:09:11 UTC (rev 598) +++ kos/doc/CHANGELOG 2008-06-23 23:42:13 UTC (rev 599) @@ -156,6 +156,7 @@ - *** Added a recursive lock synchronization primitive [LS] - *** Moved checking for free(NULL) up in code to avoid potential problems [HL] - DC fs_ramdisk.c: Don't allow opening a file with O_DIR [CG] +- *** Removed legacy libc and libm [HL] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2008-06-23 22:09:14
|
Revision: 598 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=598&view=rev Author: sannyx Date: 2008-06-23 15:09:11 -0700 (Mon, 23 Jun 2008) Log Message: ----------- revert to r359, last check-in was by mistake Modified Paths: -------------- kos/kernel/arch/dreamcast/sound/arm/stream.drv Modified: kos/kernel/arch/dreamcast/sound/arm/stream.drv =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2008-06-23 22:00:04
|
Revision: 597 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=597&view=rev Author: sannyx Date: 2008-06-23 14:59:58 -0700 (Mon, 23 Jun 2008) Log Message: ----------- don't allow opening a file with O_DIR Modified Paths: -------------- kos/doc/CHANGELOG kos/kernel/arch/dreamcast/sound/arm/stream.drv kos/kernel/fs/fs_ramdisk.c Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-06-20 02:40:29 UTC (rev 596) +++ kos/doc/CHANGELOG 2008-06-23 21:59:58 UTC (rev 597) @@ -155,6 +155,7 @@ a write lock [LS] - *** Added a recursive lock synchronization primitive [LS] - *** Moved checking for free(NULL) up in code to avoid potential problems [HL] +- DC fs_ramdisk.c: Don't allow opening a file with O_DIR [CG] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/kernel/arch/dreamcast/sound/arm/stream.drv =================================================================== (Binary files differ) Modified: kos/kernel/fs/fs_ramdisk.c =================================================================== --- kos/kernel/fs/fs_ramdisk.c 2008-06-20 02:40:29 UTC (rev 596) +++ kos/kernel/fs/fs_ramdisk.c 2008-06-23 21:59:58 UTC (rev 597) @@ -138,7 +138,7 @@ in the dir. */ if (fn[0] != 0) { f = ramdisk_find(parent, fn, strlen(fn)); - if (!dir && f->type == STAT_TYPE_DIR) + if ((!dir && f->type == STAT_TYPE_DIR) || (dir && f->type != STAT_TYPE_DIR)) return NULL; } else { /* We must have been looking for the dir itself */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <los...@us...> - 2008-06-20 02:40:30
|
Revision: 596 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=596&view=rev Author: lostgeneration Date: 2008-06-19 19:40:29 -0700 (Thu, 19 Jun 2008) Log Message: ----------- Removed legacy libc and libm. * Since libc and libm are now provided by newlib on the primary port * (Dreamcast), these are no longer used or needed. Removed Paths: ------------- kos/libc/ kos/libm/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <los...@us...> - 2008-05-30 17:32:42
|
Revision: 595 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=595&view=rev Author: lostgeneration Date: 2008-05-30 10:32:39 -0700 (Fri, 30 May 2008) Log Message: ----------- Moved check for free(NULL) up in code to avoid potential problems. * It seems that calling free(NULL) was causing problems. Moving the check for NULL up seems to help. Modified Paths: -------------- kos/doc/CHANGELOG kos/kernel/libc/koslib/malloc.c Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-05-28 13:43:26 UTC (rev 594) +++ kos/doc/CHANGELOG 2008-05-30 17:32:39 UTC (rev 595) @@ -154,6 +154,7 @@ - *** Added support for upgrading a read lock on a reader/writer semaphore to a write lock [LS] - *** Added a recursive lock synchronization primitive [LS] +- *** Moved checking for free(NULL) up in code to avoid potential problems [HL] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] Modified: kos/kernel/libc/koslib/malloc.c =================================================================== --- kos/kernel/libc/koslib/malloc.c 2008-05-28 13:43:26 UTC (rev 594) +++ kos/kernel/libc/koslib/malloc.c 2008-05-30 17:32:39 UTC (rev 595) @@ -1733,6 +1733,10 @@ int dmg = 0; #endif + /* standard C says if block is NULL, do not try to free it */ + if(m == NULL) + return; + if (MALLOC_PREACTION != 0) { return; } @@ -1744,9 +1748,6 @@ thd_current->tid, rv, (uint32)m); #endif - if (m == NULL) - return; - ctl = get_memctl(m); if (ctl->magic != BLOCK_MAGIC) { #ifndef KM_DBG_VERBOSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-05-28 13:43:42
|
Revision: 594 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=594&view=rev Author: ljsebald Date: 2008-05-28 06:43:26 -0700 (Wed, 28 May 2008) Log Message: ----------- Almost forgot to update the CHANGELOG... Modified Paths: -------------- kos/doc/CHANGELOG Modified: kos/doc/CHANGELOG =================================================================== --- kos/doc/CHANGELOG 2008-05-28 13:41:47 UTC (rev 593) +++ kos/doc/CHANGELOG 2008-05-28 13:43:26 UTC (rev 594) @@ -153,6 +153,7 @@ - DC Added support for VMU beeping [DH] - *** Added support for upgrading a read lock on a reader/writer semaphore to a write lock [LS] +- *** Added a recursive lock synchronization primitive [LS] KallistiOS version 1.2.0 ----------------------------------------------- - DC Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-05-28 13:41:53
|
Revision: 593 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=593&view=rev Author: ljsebald Date: 2008-05-28 06:41:47 -0700 (Wed, 28 May 2008) Log Message: ----------- -fno-crossjumping has been needed for a while. I'm not quite sure why the environ file didn't have it in there, but its there now (thanks waltervn). Modified Paths: -------------- kos/environ_dreamcast.sh Modified: kos/environ_dreamcast.sh =================================================================== --- kos/environ_dreamcast.sh 2008-05-28 13:34:29 UTC (rev 592) +++ kos/environ_dreamcast.sh 2008-05-28 13:41:47 UTC (rev 593) @@ -1,7 +1,7 @@ # KallistiOS environment variable settings. These are the shared pieces # for the Dreamcast(tm) platform. -export KOS_CFLAGS="${KOS_CFLAGS} -ml -m4-single-only -fno-optimize-sibling-calls" +export KOS_CFLAGS="${KOS_CFLAGS} -ml -m4-single-only -fno-crossjumping" export KOS_AFLAGS="${KOS_AFLAGS} -little" export KOS_LDFLAGS="${KOS_LDFLAGS} -ml -m4-single-only -Wl,-Ttext=0x8c010000" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ljs...@us...> - 2008-05-28 13:34:32
|
Revision: 592 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=592&view=rev Author: ljsebald Date: 2008-05-28 06:34:29 -0700 (Wed, 28 May 2008) Log Message: ----------- Adding in another new synchronization primitive: recursive locks, along with an example/test program for them. Modified Paths: -------------- kos/examples/dreamcast/basic/threading/Makefile kos/examples/dreamcast/basic/threading/rwsem/rwsem_test.c kos/include/kos.h kos/kernel/thread/Makefile kos/kernel/thread/thread.c Added Paths: ----------- kos/examples/dreamcast/basic/threading/recursive_lock/ kos/examples/dreamcast/basic/threading/recursive_lock/Makefile kos/examples/dreamcast/basic/threading/recursive_lock/rlock_test.c kos/include/kos/recursive_lock.h kos/kernel/thread/recursive_lock.c Modified: kos/examples/dreamcast/basic/threading/Makefile =================================================================== --- kos/examples/dreamcast/basic/threading/Makefile 2008-05-21 22:04:23 UTC (rev 591) +++ kos/examples/dreamcast/basic/threading/Makefile 2008-05-28 13:34:29 UTC (rev 592) @@ -8,13 +8,15 @@ all: $(KOS_MAKE) -C general $(KOS_MAKE) -C rwsem + $(KOS_MAKE) -C recursive_lock clean: $(KOS_MAKE) -C general clean $(KOS_MAKE) -C rwsem clean - + $(KOS_MAKE) -C recursive_lock clean + dist: $(KOS_MAKE) -C general dist $(KOS_MAKE) -C rwsem dist + $(KOS_MAKE) -C recursive_lock dist - Added: kos/examples/dreamcast/basic/threading/recursive_lock/Makefile =================================================================== --- kos/examples/dreamcast/basic/threading/recursive_lock/Makefile (rev 0) +++ kos/examples/dreamcast/basic/threading/recursive_lock/Makefile 2008-05-28 13:34:29 UTC (rev 592) @@ -0,0 +1,29 @@ +# KallistiOS ##version## +# +# basic/threading/recursive_lock/Makefile +# Copyright (C) 2008 Lawrence Sebald +# + +all: rm-elf rlock_test.elf + +include $(KOS_BASE)/Makefile.rules + +OBJS = rlock_test.o + +clean: rm-elf + -rm -f $(OBJS) + +rm-elf: + -rm -f rlock_test.elf + +rlock_test.elf: $(OBJS) + $(KOS_CC) $(KOS_CFLAGS) $(KOS_LDFLAGS) -o rlock_test.elf $(KOS_START) \ + $(OBJS) $(DATAOBJS) $(OBJEXTRA) $(KOS_LIBS) + + +run: rlock_test.elf + $(KOS_LOADER) rlock_test.elf + +dist: + rm -f $(OBJS) + $(KOS_STRIP) rlock_test.elf \ No newline at end of file Added: kos/examples/dreamcast/basic/threading/recursive_lock/rlock_test.c =================================================================== --- kos/examples/dreamcast/basic/threading/recursive_lock/rlock_test.c (rev 0) +++ kos/examples/dreamcast/basic/threading/recursive_lock/rlock_test.c 2008-05-28 13:34:29 UTC (rev 592) @@ -0,0 +1,128 @@ +/* KallistiOS ##version## + + rlock_test.c + Copyright (C) 2008 Lawrence Sebald + +*/ + +/* This program is a test for the recursive locks added in KOS 1.3.0. This + synchronization primitive works essentially the same as a mutex, but allows + the thread that owns the lock to acquire it as many times as it wants. */ + +#include <stdio.h> + +#include <kos/thread.h> +#include <kos/recursive_lock.h> + +#include <arch/arch.h> +#include <dc/maple.h> +#include <dc/maple/controller.h> + +#define UNUSED __attribute__((unused)) + +recursive_lock_t *l = NULL; + +void thd0(void *param UNUSED) { + int i; + + printf("Thd 0: About to obtain lock 10 times\n"); + + for(i = 0; i < 10; ++i) { + rlock_lock(l); + } + + printf("Thd 0: Lock acquired %d times\n", l->count); + printf("Thd 0: About to sleep\n"); + thd_sleep(100); + + printf("Thd 0: Awake, about to release lock 9 times\n"); + + for(i = 0; i < 9; ++i) { + rlock_unlock(l); + } + + printf("Thd 0: About to sleep again\n"); + thd_sleep(10); + + printf("Thd 0: Awake, about to release lock\n"); + rlock_unlock(l); + printf("Thd 0: done\n"); +} + +void thd1(void *param UNUSED) { + printf("Thd 1: About to obtain lock 2 times\n"); + rlock_lock(l); + rlock_lock(l); + + printf("Thd 1: About to pass timeslice\n"); + thd_pass(); + + printf("Thd 1: Awake, going to release lock 2 times\n"); + rlock_unlock(l); + rlock_unlock(l); + + printf("Thd 1: About to obtain lock 1 time\n"); + rlock_lock(l); + + printf("Thd 1: About to release lock\n"); + rlock_unlock(l); + printf("Thd 1: done\n"); +} + +void thd2(void *param UNUSED) { + int i; + + printf("Thd 2: About to obtain lock 200 times\n"); + + for(i = 0; i < 200; ++i) { + rlock_lock(l); + } + + printf("Thd 2: About to release lock 200 times\n"); + + for(i = 0; i < 200; ++i) { + rlock_unlock(l); + } + + printf("Thd 2: done\n"); +} + +KOS_INIT_FLAGS(INIT_DEFAULT); + +int main(int argc, char *argv[]) { + kthread_t *t0, *t1, *t2; + + /* Exit if the user presses all buttons at once. */ + cont_btn_callback(0, CONT_START | CONT_A | CONT_B | CONT_X | CONT_Y, + arch_exit); + + printf("KallistiOS Recursive Lock test program\n"); + + /* Create the recursive lock */ + l = rlock_create(); + + if(!l) { + printf("Could not create recursive lock, bailing out!\n"); + arch_exit(); + } + + printf("About to create threads\n"); + t0 = thd_create(thd0, NULL); + t1 = thd_create(thd1, NULL); + t2 = thd_create(thd2, NULL); + + printf("About to sleep\n"); + thd_wait(t0); + thd_wait(t1); + thd_wait(t2); + + if(rlock_is_locked(l)) { + printf("Lock is still locked!\n"); + arch_exit(); + } + + rlock_destroy(l); + + printf("Recursive lock tests completed successfully!\n"); + return 0; +} Modified: kos/examples/dreamcast/basic/threading/rwsem/rwsem_test.c =================================================================== --- kos/examples/dreamcast/basic/threading/rwsem/rwsem_test.c 2008-05-21 22:04:23 UTC (rev 591) +++ kos/examples/dreamcast/basic/threading/rwsem/rwsem_test.c 2008-05-28 13:34:29 UTC (rev 592) @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) { kthread_t *w0, *w1, *r0, *r1; - /* Exit if the user presse all buttons at once. */ + /* Exit if the user presses all buttons at once. */ cont_btn_callback(0, CONT_START | CONT_A | CONT_B | CONT_X | CONT_Y, arch_exit); Added: kos/include/kos/recursive_lock.h =================================================================== --- kos/include/kos/recursive_lock.h (rev 0) +++ kos/include/kos/recursive_lock.h 2008-05-28 13:34:29 UTC (rev 592) @@ -0,0 +1,59 @@ +/* KallistiOS ##version## + + include/kos/recursive_lock.h + Copyright (C) 2008 Lawrence Sebald + +*/ + +/* This file defines a recursive lock mechanism. Basically, think of these as + a mutex that a single thread can acquire as many times as it wants, but no + other threads can acquire. */ + +#ifndef __KOS_RECURSIVE_LOCK_H +#define __KOS_RECURSIVE_LOCK_H + +#include <sys/cdefs.h> +__BEGIN_DECLS + +#include <sys/queue.h> +#include <kos/thread.h> + +typedef struct recursive_lock { + /* What thread currently holds the lock, if any? */ + kthread_t *holder; + + /* How many times does this thread hold the lock? */ + int count; +} recursive_lock_t; + +/* Allocate a new recursive lock. Returns NULL on failure. + ENOMEM - Out of memory */ +recursive_lock_t *rlock_create(); + +/* Destroy a recursive lock */ +void rlock_destroy(recursive_lock_t *l); + +/* Lock a recursive lock. Returns -1 on error. + EPERM - called inside an interrupt + EINTR - was interrupted */ +int rlock_lock(recursive_lock_t *l); + +/* Unlock a recursive lock. Returns -1 on error. + EPERM - the lock is not held by the current thread */ +int rlock_unlock(recursive_lock_t *l); + +/* Attempt to lock a recursive lock. If the call to rlock_lock() would normally + block, return -1 for error. + EWOULDBLOCK - would block */ +int rlock_trylock(recursive_lock_t *l); + +/* Return whether the lock is currently held. */ +int rlock_is_locked(recursive_lock_t *l); + +/* Init / shutdown */ +int rlock_init(); +void rlock_shutdown(); + +__END_DECLS + +#endif /* !__KOS_RECURSIVE_LOCK_H */ Modified: kos/include/kos.h =================================================================== --- kos/include/kos.h 2008-05-21 22:04:23 UTC (rev 591) +++ kos/include/kos.h 2008-05-28 13:34:29 UTC (rev 592) @@ -30,6 +30,7 @@ #include <kos/thread.h> #include <kos/sem.h> #include <kos/rwsem.h> +#include <kos/recursive_lock.h> #include <kos/mutex.h> #include <kos/cond.h> #include <kos/genwait.h> Modified: kos/kernel/thread/Makefile =================================================================== --- kos/kernel/thread/Makefile 2008-05-21 22:04:23 UTC (rev 591) +++ kos/kernel/thread/Makefile 2008-05-28 13:34:29 UTC (rev 592) @@ -6,7 +6,7 @@ # $Id: Makefile,v 1.4 2003/02/14 08:25:07 bardtx Exp $ OBJS = sem.o cond.o mutex.o genwait.o -OBJS += thread.o rwsem.o +OBJS += thread.o rwsem.o recursive_lock.o SUBDIRS = include $(KOS_BASE)/Makefile.prefab Added: kos/kernel/thread/recursive_lock.c =================================================================== --- kos/kernel/thread/recursive_lock.c (rev 0) +++ kos/kernel/thread/recursive_lock.c 2008-05-28 13:34:29 UTC (rev 592) @@ -0,0 +1,146 @@ +/* KallistiOS ##version## + + recursive_lock.c + Copyright (C) 2008 Lawrence Sebald +*/ + +/* This file defines recursive locks. */ + +#include <malloc.h> +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include <sys/queue.h> + +#include <kos/recursive_lock.h> +#include <kos/thread.h> +#include <kos/genwait.h> + +/* Create a recursive lock */ +recursive_lock_t *rlock_create() { + recursive_lock_t *rv; + + rv = (recursive_lock_t *)malloc(sizeof(recursive_lock_t)); + if(!rv) { + errno = ENOMEM; + } + + rv->holder = NULL; + rv->count = 0; + + return rv; +} + +/* Destroy a recursive lock */ +void rlock_destroy(recursive_lock_t *l) { + assert(l); + assert(!l->count); + + free(l); +} + +/* Lock a recursive lock */ +int rlock_lock(recursive_lock_t *l) { + int old, rv = 0; + + if(irq_inside_int()) { + dbglog(DBG_WARNING, "rlock_lock: called inside interrupt\n"); + errno = EPERM; + return -1; + } + + old = irq_disable(); + + /* If the lock is not held, let the thread proceed */ + if(!l->count) { + assert(!l->holder); + + l->count = 1; + l->holder = thd_current; + } + else if(l->holder == thd_current) { + ++l->count; + } + else { + /* Block until the lock isn't held any more */ + rv = genwait_wait(l, "rlock_lock", 0, NULL); + + if(rv < 0) { + assert(errno == EINTR); + rv = -1; + } + else { + l->count = 1; + l->holder = thd_current; + } + } + + irq_restore(old); + return rv; +} + +/* Unlock a recursive lock */ +int rlock_unlock(recursive_lock_t *l) { + int old, rv = 0; + + old = irq_disable(); + + /* Make sure we currently hold the lock */ + if(l->holder != thd_current) { + rv = -1; + errno = EPERM; + } + else { + --l->count; + + /* If we're done holding the lock, mark it as such, and signal the next + thread waiting, if any. */ + if(!l->count) { + l->holder = NULL; + genwait_wake_one(l); + } + } + + irq_restore(old); + return rv; +} + +/* Attempt to lock a recursive lock */ +int rlock_trylock(recursive_lock_t *l) { + int old, rv = 0; + + old = irq_disable(); + + /* Check if the lock is held, if so, check if the current thread holds the + lock. */ + if(l->count) { + if(l->holder == thd_current) { + ++l->count; + } + else { + rv = -1; + errno = EWOULDBLOCK; + } + } + else { + l->holder = thd_current; + l->count = 1; + } + + irq_restore(old); + return rv; +} + +/* Return whether or not the lock is currently held */ +int rlock_is_locked(recursive_lock_t *l) { + return !!l->count; +} + +/* Initialize recursive locks */ +int rlock_init() { + return 0; +} + +/* Shut down recursive locks */ +void rlock_shutdown() { +} Modified: kos/kernel/thread/thread.c =================================================================== --- kos/kernel/thread/thread.c 2008-05-21 22:04:23 UTC (rev 591) +++ kos/kernel/thread/thread.c 2008-05-28 13:34:29 UTC (rev 592) @@ -13,6 +13,7 @@ #include <kos/thread.h> #include <kos/sem.h> #include <kos/rwsem.h> +#include <kos/recursive_lock.h> #include <kos/cond.h> #include <kos/genwait.h> #include <arch/irq.h> @@ -771,6 +772,7 @@ /* Initialize thread sync primitives */ genwait_init(); rwsem_init(); + rlock_init(); sem_init(); cond_init(); @@ -812,6 +814,7 @@ /* Shutdown thread sync primitives */ rwsem_shutdown(); + rlock_shutdown(); sem_shutdown(); cond_shutdown(); genwait_shutdown(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2008-05-21 22:04:42
|
Revision: 591 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=591&view=rev Author: fackue Date: 2008-05-21 15:04:23 -0700 (Wed, 21 May 2008) Log Message: ----------- DESTDIR patch Modified Paths: -------------- kos/utils/dc-chain/Makefile Modified: kos/utils/dc-chain/Makefile =================================================================== --- kos/utils/dc-chain/Makefile 2008-05-21 20:33:31 UTC (rev 590) +++ kos/utils/dc-chain/Makefile 2008-05-21 22:04:23 UTC (rev 591) @@ -92,10 +92,10 @@ build_arm_targets=build-arm-binutils build-arm-gcc build-arm-gcc-pass1 $(build_sh4_targets): prefix = $(sh_prefix) $(build_sh4_targets): target = $(sh_target) -$(build_arm_targets): extra_configure_args = "" +$(build_sh4_targets): extra_configure_args = $(build_arm_targets): prefix = $(arm_prefix) $(build_arm_targets): target = $(arm_target) -$(build_arm_targets): extra_configure_args = "--with-arch=armv4" +$(build_arm_targets): extra_configure_args = --with-arch=armv4 # To avoid code repetition, we use the same commands for both # architectures. But we can't create a single target called @@ -116,8 +116,8 @@ -mkdir -p $(build) > $(log) cd $(build); ../$(src_dir)/configure --target=$(target) --prefix=$(prefix) $(to_log) - make -C $(build) all install $(to_log) - make -C $(build)/bfd install_libbfd $(to_log) + make -C $(build) all install DESTDIR=$(DESTDIR) $(to_log) + make -C $(build)/bfd install_libbfd DESTDIR=$(DESTDIR) $(to_log) $(clean_up) $(build_gcc_pass1) $(build_gcc_pass2): build = build-gcc-$(target)-$(gcc_ver) @@ -128,7 +128,7 @@ -mkdir -p $(build) > $(log) cd $(build); ../$(src_dir)/configure --target=$(target) --prefix=$(prefix) --without-headers --with-newlib --enable-languages=c $(extra_configure_args) $(to_log) - make -C $(build) all-gcc install-gcc $(to_log) + make -C $(build) all-gcc install-gcc DESTDIR=$(DESTDIR) $(to_log) $(build_newlib): build = build-newlib-$(target)-$(newlib_ver) $(build_newlib): src_dir = newlib-$(newlib_ver) @@ -140,10 +140,10 @@ cd $(build); ../$(src_dir)/configure --target=$(target) --prefix=$(prefix) $(to_log) make -C $(build) all install CC_FOR_TARGET=$(install)/$(target)-gcc AS_FOR_TARGET=$(install)/$(target)-as \ LD_FOR_TARGET=$(install)/$(target)-ld AR_FOR_TARGET=$(install)/$(target)-ar \ - RANLIB_FOR_TARGET=$(install)/$(target)-ranlib $(to_log) + RANLIB_FOR_TARGET=$(install)/$(target)-ranlib DESTDIR=$(DESTDIR) $(to_log) $(clean_up) -fixup-sh4-newlib: newlib_inc=$(sh_prefix)/$(sh_target)/include +fixup-sh4-newlib: newlib_inc=$(DESTDIR)$(sh_prefix)/$(sh_target)/include fixup-sh4-newlib: @echo "+++ Fixing up sh4 newlib includes..." # KOS pthread.h is modified @@ -166,7 +166,7 @@ > $(log) cd $(build); ../$(src_dir)/configure --target=$(target) --prefix=$(prefix) --with-newlib \ --enable-threads=$(thread_model) --enable-languages=c,c++ $(to_log) - make -C $(build) all install $(to_log) + make -C $(build) all install DESTDIR=$(DESTDIR) $(to_log) $(clean_up) # ---- }}}} @@ -210,7 +210,7 @@ install_gdb_stamp: @echo "+++ Installing GDB..." rm -f $@ - make -C build-gdb-$(gdb_ver) install $(to_log) + make -C build-gdb-$(gdb_ver) install DESTDIR=$(DESTDIR) $(to_log) touch $@ gdb: install_gdb @@ -254,7 +254,7 @@ install_insight_stamp: @echo "+++ Installing INSIGHT..." rm -f $@ - make -C build-insight-$(insight_ver) install $(to_log) + make -C build-insight-$(insight_ver) install DESTDIR=$(DESTDIR) $(to_log) touch $@ insight: install_insight This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |