From f6ddd85a683907d4f35d1c739f66185beab5c374 Mon Sep 17 00:00:00 2001 From: platon42 Date: Sat, 4 Jul 2009 16:19:50 +0000 Subject: [PATCH] Sashimi now calls RawIOInit() on removing the patches to allow reinitializing the debug routines, whatever's behind it. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@31527 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/tools/debug/sashimi/sashimi.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/workbench/tools/debug/sashimi/sashimi.c b/workbench/tools/debug/sashimi/sashimi.c index a64b0e7eb..0a2498738 100644 --- a/workbench/tools/debug/sashimi/sashimi.c +++ b/workbench/tools/debug/sashimi/sashimi.c @@ -169,10 +169,10 @@ AROS_LH0(LONG, NewRawMayGetChar, struct ExecBase *, SysBase, 85, Exec) { AROS_LIBFUNC_INIT - + /* We always return sort of a confirmation. */ return('y'); - + AROS_LIBFUNC_EXIT } @@ -283,7 +283,7 @@ StoreFIFOChar(struct SashimiResource * sr,UBYTE c) AROS_LH1(void, NewRawPutChar, AROS_LHA(UBYTE, c, D0), struct ExecBase *, SysBase, 86, Exec) -{ +{ AROS_LIBFUNC_INIT /* Do not store NUL bytes. */ @@ -347,6 +347,10 @@ RemovePatches(VOID) if(res != AROS_SLIB_ENTRY(NewRawPutChar,Exec)) SetFunction(&SysBase->LibNode,LVORawPutChar,res); + /* make sure IO is re-inited + */ + RawIOInit(); + Enable(); } @@ -806,22 +810,22 @@ main(int argc,char **argv) else { ULONG bufferSize; - + /* The default buffer size is 32K. */ bufferSize = 32 * 1024; - + /* Check for a specific buffer size (power of two). */ if(ShellArguments.BufferK != NULL) bufferSize = 1024 * (*ShellArguments.BufferK); - + /* Check for a specific buffer size. */ if(ShellArguments.BufferSize != NULL) bufferSize = (ULONG)(*ShellArguments.BufferSize); - + /* Don't make the buffer too small. */ if(bufferSize < 4096) bufferSize = 4096; - + /* Add the resource to the public list. Note that * the patches are not installed yet. */ @@ -1126,7 +1130,7 @@ main(int argc,char **argv) WaitIO((struct IORequest *)timeRequest); } - + /* Check if we should and could save the circular buffer. */ if(ShellArguments.AskSave && GetCharsInFIFO(sr) > 0) { -- 2.11.4.GIT