diff options
| author | Sverker Eriksson <[email protected]> | 2019-01-31 19:36:01 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-01-31 19:36:01 +0100 |
| commit | 14fe4c3ccf93c023f851512e573e2bac7d00b232 (patch) | |
| tree | 2300a8b2b96e6b6f43d009f72a3e82e818a9eb9d /lib | |
| parent | 81487129feb5823bf4c3a1721ce655d1e1616781 (diff) | |
| parent | 780c5a2c43591fc17925177120b67b99d26e70e7 (diff) | |
| download | otp-14fe4c3ccf93c023f851512e573e2bac7d00b232.tar.gz otp-14fe4c3ccf93c023f851512e573e2bac7d00b232.tar.bz2 otp-14fe4c3ccf93c023f851512e573e2bac7d00b232.zip | |
Merge branch 'sverker/port-control-badarg/OTP-15555' into maint
* sverker/port-control-badarg/OTP-15555:
erts: Add doc warnings for erlang:port_command|call|control
erts: Add magic port control numbers
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/src/standard_error.erl | 3 | ||||
| -rw-r--r-- | lib/kernel/src/user.erl | 3 | ||||
| -rw-r--r-- | lib/kernel/src/user_drv.erl | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/lib/kernel/src/standard_error.erl b/lib/kernel/src/standard_error.erl index 5d649e5f94..ef5b532960 100644 --- a/lib/kernel/src/standard_error.erl +++ b/lib/kernel/src/standard_error.erl @@ -27,7 +27,8 @@ -define(PROCNAME_SUP, standard_error_sup). %% Defines for control ops --define(CTRL_OP_GET_WINSIZE,100). +-define(ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER, 16#018b0900). +-define(CTRL_OP_GET_WINSIZE, (100 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)). %% %% The basic server and start-up. diff --git a/lib/kernel/src/user.erl b/lib/kernel/src/user.erl index 872e63ab53..0c9e1ea303 100644 --- a/lib/kernel/src/user.erl +++ b/lib/kernel/src/user.erl @@ -28,7 +28,8 @@ -define(NAME, user). %% Defines for control ops --define(CTRL_OP_GET_WINSIZE,100). +-define(ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER, 16#018b0900). +-define(CTRL_OP_GET_WINSIZE, (100 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)). %% %% The basic server and start-up. diff --git a/lib/kernel/src/user_drv.erl b/lib/kernel/src/user_drv.erl index 9f914aa222..08286dd476 100644 --- a/lib/kernel/src/user_drv.erl +++ b/lib/kernel/src/user_drv.erl @@ -32,9 +32,10 @@ -define(OP_BEEP,4). -define(OP_PUTC_SYNC,5). % Control op --define(CTRL_OP_GET_WINSIZE,100). --define(CTRL_OP_GET_UNICODE_STATE,101). --define(CTRL_OP_SET_UNICODE_STATE,102). +-define(ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER, 16#018b0900). +-define(CTRL_OP_GET_WINSIZE, (100 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)). +-define(CTRL_OP_GET_UNICODE_STATE, (101 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)). +-define(CTRL_OP_SET_UNICODE_STATE, (102 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)). %% start() %% start(ArgumentList) |