diff options
| author | Raimo Niskanen <[email protected]> | 2011-12-07 14:55:59 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-12-09 11:46:30 +0100 |
| commit | 1f36e85aa0b5ab0ffa325cb32ed4e389e418e028 (patch) | |
| tree | 4e565b2e14188a8ea9878a88e8a23185e4964f56 /erts/emulator/test/ddll_SUITE_data/echo_drv.c | |
| parent | e6aed438fc47f16f44154457a50883373e14ad5b (diff) | |
| download | otp-1f36e85aa0b5ab0ffa325cb32ed4e389e418e028.tar.gz otp-1f36e85aa0b5ab0ffa325cb32ed4e389e418e028.tar.bz2 otp-1f36e85aa0b5ab0ffa325cb32ed4e389e418e028.zip | |
emulator test drivers: Conform to updated driver API
Diffstat (limited to 'erts/emulator/test/ddll_SUITE_data/echo_drv.c')
| -rw-r--r-- | erts/emulator/test/ddll_SUITE_data/echo_drv.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/erts/emulator/test/ddll_SUITE_data/echo_drv.c b/erts/emulator/test/ddll_SUITE_data/echo_drv.c index edf78a979d..2b3510c641 100644 --- a/erts/emulator/test/ddll_SUITE_data/echo_drv.c +++ b/erts/emulator/test/ddll_SUITE_data/echo_drv.c @@ -3,9 +3,10 @@ static ErlDrvPort erlang_port; static ErlDrvData echo_start(ErlDrvPort, char *); -static void from_erlang(ErlDrvData, char*, int); -static int echo_call(ErlDrvData drv_data, unsigned int command, char *buf, - int len, char **rbuf, int rlen, unsigned *ret_flags); +static void from_erlang(ErlDrvData, char*, ErlDrvSizeT); +static ErlDrvSSizeT echo_call(ErlDrvData drv_data, unsigned int command, + char *buf, ErlDrvSizeT len, + char **rbuf, ErlDrvSizeT rlen, unsigned *ret_flags); static ErlDrvEntry echo_driver_entry = { NULL, /* Init */ echo_start, @@ -21,7 +22,15 @@ static ErlDrvEntry echo_driver_entry = { NULL, NULL, NULL, - echo_call + echo_call, + NULL, + ERL_DRV_EXTENDED_MARKER, + ERL_DRV_EXTENDED_MAJOR_VERSION, + ERL_DRV_EXTENDED_MINOR_VERSION, + 0, + NULL, + NULL, + NULL }; DRIVER_INIT(echo_drv) @@ -36,14 +45,15 @@ echo_start(ErlDrvPort port, char *buf) } static void -from_erlang(ErlDrvData data, char *buf, int count) +from_erlang(ErlDrvData data, char *buf, ErlDrvSizeT count) { driver_output((ErlDrvPort) data, buf, count); } -static int -echo_call(ErlDrvData drv_data, unsigned int command, char *buf, - int len, char **rbuf, int rlen, unsigned *ret_flags) +static ErlDrvSSizeT +echo_call(ErlDrvData drv_data, unsigned int command, + char *buf, ErlDrvSizeT len, char **rbuf, ErlDrvSizeT rlen, + unsigned *ret_flags) { *rbuf = buf; *ret_flags |= DRIVER_CALL_KEEP_BUFFER; |