From: <ljs...@us...> - 2012-05-24 00:50:33
|
Revision: 768 http://cadcdev.svn.sourceforge.net/cadcdev/?rev=768&view=rev Author: ljsebald Date: 2012-05-24 00:50:27 +0000 (Thu, 24 May 2012) Log Message: ----------- Use dbgio_enable() and dbgio_disable() around fs_dclsocket, rather than doing things the hacky way they were done before. Modified Paths: -------------- kos/kernel/arch/dreamcast/fs/fs_dclsocket.c kos/kernel/arch/dreamcast/kernel/init.c Modified: kos/kernel/arch/dreamcast/fs/fs_dclsocket.c =================================================================== --- kos/kernel/arch/dreamcast/fs/fs_dclsocket.c 2012-05-24 00:48:37 UTC (rev 767) +++ kos/kernel/arch/dreamcast/fs/fs_dclsocket.c 2012-05-24 00:50:27 UTC (rev 768) @@ -793,7 +793,7 @@ /* Disable the console first of all */ if(!strcmp(dbgio_dev_get(), "fs_dclsocket")) - dbgio_dev_select("null"); + dbgio_disable(); /* Send dc-tool an exit packet */ memcpy(cmd.id, "DC00", 4); Modified: kos/kernel/arch/dreamcast/kernel/init.c =================================================================== --- kos/kernel/arch/dreamcast/kernel/init.c 2012-05-24 00:48:37 UTC (rev 767) +++ kos/kernel/arch/dreamcast/kernel/init.c 2012-05-24 00:50:27 UTC (rev 768) @@ -121,7 +121,7 @@ /* Check if the dcload-ip console is up, and if so, disable it, otherwise we'll crash when we attempt to bring up the BBA */ if(!(__kos_init_flags & INIT_NO_DCLOAD) && dcload_type == DCLOAD_TYPE_IP) { - dbgio_dev_select("scif"); + dbgio_disable(); } net_init(); /* Enable networking (and drivers) */ @@ -130,6 +130,7 @@ fs_dclsocket_init_console(); if(!fs_dclsocket_init()) { dbgio_dev_select("fs_dclsocket"); + dbgio_enable(); dbglog(DBG_INFO, "fs_dclsocket console support enabled\n"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |