diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/slang.erl | 28 | ||||
| -rw-r--r-- | src/slang_int.hrl | 20 |
3 files changed, 26 insertions, 26 deletions
diff --git a/src/Makefile b/src/Makefile index b383c01..dc7fa4b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -11,12 +11,12 @@ include ../include.mk include ../vsn.mk ERLC_FLAGS+=-W $(DEBUG_FLAGS) -MODULES = slang +MODULES = slang TARGETS = $(MODULES:%=../ebin/%.beam) ../ebin/slang.app -all debug: $(TARGETS) +all debug: $(TARGETS) clean: rm -f $(TARGETS) ../ebin/slang.app: slang.app.src diff --git a/src/slang.erl b/src/slang.erl index eca5507..e90501a 100644 --- a/src/slang.erl +++ b/src/slang.erl @@ -17,13 +17,13 @@ stop_user() -> Flag=process_flag(trap_exit, true), {links, Lks0} = process_info(whereis(user),links), Lks = lists:delete(whereis(error_logger), Lks0), - + Hs = gen_event:which_handlers(error_logger), - + case lists:member(error_logger_tty_h, Hs) of true -> error_logger:delete_report_handler(error_logger_tty_h), - + supervisor:terminate_child(kernel_sup, user), lists:foreach(fun(Pid) -> @@ -56,8 +56,8 @@ wait_user(_) -> init_tty(AbortChar, FlowControl, Opost) -> P = gp(), - p_cmd(P, ?INIT_TTY, [{int, AbortChar}, - {int, FlowControl}, + p_cmd(P, ?INIT_TTY, [{int, AbortChar}, + {int, FlowControl}, {int, Opost}], int32). set_abort_signal(null) -> @@ -122,7 +122,7 @@ signal(Sig, Fun) -> smg_fill_region (R, C, Nr, Nc, Ch) -> P = gp(), p_cmd(P,?SMG_FILL_REGION, [{int,R}, {int, C}, - {int, Nr}, {int, Nc}, + {int, Nr}, {int, Nc}, {char, Ch}], void). smg_set_char_set (A) -> @@ -194,7 +194,7 @@ smg_write_nchars (S, N) -> smg_write_wrapped_string (S, R, C, Nr, Nc, Fill) -> P = gp(), p_cmd(P, ?SMG_WRITE_WRAPPED_STRING, [{string, S},{int, R}, {int, C}, - {int, Nr}, {int, Nc}, {int, Fill}], + {int, Nr}, {int, Nc}, {int, Fill}], void). smg_cls () -> @@ -324,7 +324,7 @@ p_cmd(P, Op, ArgList, Expect) -> end. rec_loop(P, Expect, Sig) -> - receive + receive {P, {data, [1 |What]}} -> {expect(What, Expect), Sig}; {P, {data, [0 , X1, X2, X3, X4]}} -> @@ -338,7 +338,7 @@ rec_loop(P, Expect, Sig) -> {'EXIT', P, Reason} -> exit(Reason) after 200 -> - P ! {self(), {command, [255]}}, % tick + P ! {self(), {command, [255]}}, % tick rec_loop(P, Expect, Sig) end. @@ -378,7 +378,7 @@ mk_args([{smg_char_type, Str} |Tail]) when list(Str) -> Len = 2 * length(Str), List = [?int32(Len) | lists:map(fun(I) -> ?int16(I) end, Str)] , [List| mk_args(Tail)]. - + open_slang_driver() -> erl_ddll:start(), @@ -628,17 +628,17 @@ debug(File, Line, Fmt, Args) -> Fd -> Fd end, - + Str = lists:flatten( io_lib:format("DEBUG ~s:~p, pid ~w: ~n", - [filename:basename(File), + [filename:basename(File), Line, self()])), - + case io:format(DFD, Str ++ Fmt ++ "~n", Args) of ok -> ok; _ -> io:format(DFD, "ERROR ~p:~p: Pid ~w: (bad format)~n~p,~p~n", [File, Line, self(), Fmt, Args]), - + ok end. diff --git a/src/slang_int.hrl b/src/slang_int.hrl index 0d47f7f..cdb21e9 100644 --- a/src/slang_int.hrl +++ b/src/slang_int.hrl @@ -1,7 +1,7 @@ %%%---------------------------------------------------------------------- %%% File : slang_int.hrl %%% Author : Claes Wikstrom <klacke@kaja.hemma.net> -%%% Purpose : +%%% Purpose : %%% Created : 5 Dec 2000 by Claes Wikstrom <klacke@kaja.hemma.net> %%%---------------------------------------------------------------------- @@ -138,17 +138,17 @@ -define(int24(X), [((X) bsr 16) band 16#ff, ((X) bsr 8) band 16#ff, (X) band 16#ff]). --define(int32(X), +-define(int32(X), [((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff, ((X) bsr 8) band 16#ff, (X) band 16#ff]). %% Bytes to unsigned --define(u64(X7,X6,X5,X4,X3,X2,X1,X0), +-define(u64(X7,X6,X5,X4,X3,X2,X1,X0), ( ((X7) bsl 56) bor ((X6) bsl 48) bor ((X5) bsl 40) bor - ((X4) bsl 32) bor ((X3) bsl 24) bor ((X2) bsl 16) bor + ((X4) bsl 32) bor ((X3) bsl 24) bor ((X2) bsl 16) bor ((X1) bsl 8) bor (X0) )). --define(u32(X3,X2,X1,X0), +-define(u32(X3,X2,X1,X0), (((X3) bsl 24) bor ((X2) bsl 16) bor ((X1) bsl 8) bor (X0))). -define(u24(X2,X1,X0), @@ -156,20 +156,20 @@ -define(u16(X1,X0), (((X1) bsl 8) bor (X0))). - + -define(u8(X0), (X0)). %% Bytes to signed -define(i32(X3,X2,X1,X0), - (?u32(X3,X2,X1,X0) - + (?u32(X3,X2,X1,X0) - (if (X3) > 127 -> 16#100000000; true -> 0 end))). -define(i24(X2,X1,X0), - (?u24(X2,X1,X0) - + (?u24(X2,X1,X0) - (if (X2) > 127 -> 16#1000000; true -> 0 end))). - + -define(i16(X1,X0), - (?u16(X1,X0) - + (?u16(X1,X0) - (if (X1) > 127 -> 16#10000; true -> 0 end))). -define(i8(X0), |