Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1124-ge3b95d9
|
From: ljsebald <ljs...@us...> - 2023-11-13 02:54:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via e3b95d9f59db2326486f309771490479e71e05ba (commit)
via 058b33687ea42842bc8308167351ced4d4a4ce7e (commit)
via 2bdbe52f02cd804429918fa274529347692bcadd (commit)
via 95935be4423884fceb4b9ca7459c5449903fd003 (commit)
from eadd3fb6bb7837e7eeec1d81f783f6a4b512a53b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e3b95d9f59db2326486f309771490479e71e05ba
Author: Lawrence Sebald <ljs...@us...>
Date: Sun Nov 12 21:53:51 2023 -0500
Fix comment to C89/C90 style.
commit 058b33687ea42842bc8308167351ced4d4a4ce7e
Author: Andress Barajas <and...@gm...>
Date: Sun Nov 12 18:33:39 2023 -0800
Fixed typo and updated function name (#359)
* Fixed typo and updated function name
* Fix other examples
* Fix makefile
commit 2bdbe52f02cd804429918fa274529347692bcadd
Merge: eadd3fb 95935be
Author: Lawrence Sebald <ljs...@us...>
Date: Sun Nov 12 21:31:24 2023 -0500
Merge pull request #361 from has207/getsockopt
getsockopt(): add no-op handling for SO_ERROR
commit 95935be4423884fceb4b9ca7459c5449903fd003
Author: Heel <he...@ex...>
Date: Mon Nov 13 09:52:05 2023 +0900
getsockopt(): add no-op handling for SO_ERROR
-----------------------------------------------------------------------
Summary of changes:
examples/dreamcast/cpp/dcplib/fnt_test.cc | 3 ---
examples/dreamcast/hello/hello.c | 6 ------
examples/dreamcast/sound/multi-stream/Makefile | 4 ++--
examples/dreamcast/sound/multi-stream/README | 2 +-
examples/dreamcast/sound/multi-stream/main.c | 4 ++--
kernel/net/net_tcp.c | 5 +++++
6 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/examples/dreamcast/cpp/dcplib/fnt_test.cc b/examples/dreamcast/cpp/dcplib/fnt_test.cc
index 206b57a..320e3df 100644
--- a/examples/dreamcast/cpp/dcplib/fnt_test.cc
+++ b/examples/dreamcast/cpp/dcplib/fnt_test.cc
@@ -5,9 +5,6 @@
#include <kos.h>
#include <dcplib/fnt.h>
-extern uint8 romdisk[];
-KOS_INIT_ROMDISK(romdisk);
-
fntRenderer *text;
const int MAX_FONTS = 20;
diff --git a/examples/dreamcast/hello/hello.c b/examples/dreamcast/hello/hello.c
index 37a23d0..c1da1c6 100644
--- a/examples/dreamcast/hello/hello.c
+++ b/examples/dreamcast/hello/hello.c
@@ -6,9 +6,6 @@
#include <kos.h>
-/* You can safely remove this line if you don't use a ROMDISK */
-extern uint8 romdisk[];
-
/* These macros tell KOS how to initialize itself. All of this initialization
happens before main() gets called, and the shutdown happens afterwards. So
you need to set any flags you want here. Here are some possibilities:
@@ -22,9 +19,6 @@ extern uint8 romdisk[];
the current KOS defaults, use INIT_DEFAULT (or leave it out entirely). */
KOS_INIT_FLAGS(INIT_DEFAULT | INIT_MALLOCSTATS);
-/* And specify a romdisk, if you want one (or leave it out) */
-KOS_INIT_ROMDISK(romdisk);
-
/* Your program's main entry point */
int main(int argc, char **argv) {
/* The requisite line */
diff --git a/examples/dreamcast/sound/multi-stream/Makefile b/examples/dreamcast/sound/multi-stream/Makefile
index da2fa38..aebb3f8 100644
--- a/examples/dreamcast/sound/multi-stream/Makefile
+++ b/examples/dreamcast/sound/multi-stream/Makefile
@@ -18,10 +18,10 @@ clean:
$(TARGET): $(OBJS)
kos-cc -o $(TARGET) $(OBJS) $(DATAOBJS) $(OBJEXTRA) -lwav
-run:
+run: $(TARGET)
$(KOS_LOADER) $(TARGET)
-dist:
+dist: $(TARGET)
rm -f $(OBJS) romdisk.o romdisk.img
$(KOS_STRIP) $(TARGET)
diff --git a/examples/dreamcast/sound/multi-stream/README b/examples/dreamcast/sound/multi-stream/README
index 7e4504f..3cd7ac6 100644
--- a/examples/dreamcast/sound/multi-stream/README
+++ b/examples/dreamcast/sound/multi-stream/README
@@ -15,6 +15,6 @@ audio formats:
4-bit ADPCM data (as demonstrated in this example)
8-bit and 16-bit uncompressed PCM data
-Use the following command to convert a 16-bit stereo PCM WAV file (PCM16_stereo.wav) to a 8-bit stero PCM WAV file (PCM8_mono.wav):
+Use the following command to convert a 16-bit stereo PCM WAV file (PCM16_stereo.wav) to a 8-bit stereo PCM WAV file (PCM8_mono.wav):
ffmpeg -i PCM16_stereo.wav -acodec pcm_u8 -ac 1 PCM8_mono.wav
diff --git a/examples/dreamcast/sound/multi-stream/main.c b/examples/dreamcast/sound/multi-stream/main.c
index bb64d32..513be08 100644
--- a/examples/dreamcast/sound/multi-stream/main.c
+++ b/examples/dreamcast/sound/multi-stream/main.c
@@ -49,11 +49,11 @@ int main(int argc, char **argv) {
// Play wav files if they arent playing already
if(button_pressed(current_buttons, changed_buttons, CONT_X)) {
- if(!wav_isplaying(faucet))
+ if(!wav_is_playing(faucet))
wav_play(faucet);
}
if(button_pressed(current_buttons, changed_buttons, CONT_Y)) {
- if(!wav_isplaying(brushing))
+ if(!wav_is_playing(brushing))
wav_play(brushing);
}
// Stop playing faucet
diff --git a/kernel/net/net_tcp.c b/kernel/net/net_tcp.c
index 32ac8a5..5a82daa 100644
--- a/kernel/net/net_tcp.c
+++ b/kernel/net/net_tcp.c
@@ -1688,6 +1688,10 @@ static int net_tcp_getsockopt(net_socket_t *hnd, int level, int option_name,
tmp = sock->state == TCP_STATE_LISTEN;
goto copy_int;
+ case SO_ERROR:
+ /* Checking/resetting errors not implemented */
+ goto simply_return;
+
case SO_RCVBUF:
tmp = sock->rcvbuf_sz;
goto copy_int;
@@ -1753,6 +1757,7 @@ copy_int:
memcpy(option_value, &tmp, *option_len);
}
+simply_return:
mutex_unlock(&sock->mutex);
rwsem_read_unlock(&tcp_sem);
return 0;
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
