Merge branch 'raimo/64-bit-driver-api/OTP-9795'

* raimo/64-bit-driver-api/OTP-9795: (22 commits)
  driver_SUITE.erl: Fix sys info drivers
  emulator test drivers: Conform to updated driver API
  runtime_tools's drivers: Conform to updated driver API
  ws's xwe_driver.c: Conform to updated driver API
  megaco's flex scanner: Conform to updated driver API
  seq_trace_SUITE_data/echo_drv.c: Conform to updated driver API
  erl_interface tests: Conform port_call_drv.c updated driver API
  erl_drv_thread_SUITE_data/testcase_driver.c: Conform to updated driver API
  float_SUITE_data/fp_drv.c: Conform to updated driver API
  port_SUITE_data/*_drv.c: Conform to updated driver API
  port_bif_SUITE_data/control_drv.c: Conform to updated driver API
  send_term_SUITE_data/send_term_drv.c: Conform to updated driver API
  system_profile_SUITE_data/echo_drv.c: Conform to updated driver API
  trace_port_SUITE_data/echo_drv.c: Conform to updated driver API
  Remove support for old drivers without ERL_DRV_EXTENDED_MARKER
  built-in drivers: Add ERL_DRV_EXTENDED_MARKER and version numbers
  Bump driver version to 2.0
  erl_driver.h: Enlarge type on return value from call
  erl_driver.h: Enlarge types on driver callbacks output, control and call
  erl_driver.h: Enlarge types in driver output functions
  ...

Conflicts:
	erts/emulator/test/driver_SUITE_data/monitor_drv.c
	erts/emulator/test/driver_SUITE_data/timer_drv.c

1 files changed, 16 insertions, 13 deletions

diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 52477467b3..f94e0f2296 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -1033,14 +1033,15 @@ static struct driver_data {
 /* Driver interfaces */
 static ErlDrvData spawn_start(ErlDrvPort, char*, SysDriverOpts*);
 static ErlDrvData fd_start(ErlDrvPort, char*, SysDriverOpts*);
-static int fd_control(ErlDrvData, unsigned int, char *, int, char **, int);
+static ErlDrvSSizeT fd_control(ErlDrvData, unsigned int, char *, ErlDrvSizeT,
+			       char **, ErlDrvSizeT);
 static ErlDrvData vanilla_start(ErlDrvPort, char*, SysDriverOpts*);
 static int spawn_init(void);
 static void fd_stop(ErlDrvData);
 static void stop(ErlDrvData);
 static void ready_input(ErlDrvData, ErlDrvEvent);
 static void ready_output(ErlDrvData, ErlDrvEvent);
-static void output(ErlDrvData, char*, int);
+static void output(ErlDrvData, char*, ErlDrvSizeT);
 static void outputv(ErlDrvData, ErlIOVec*);
 static void stop_select(ErlDrvEvent, void*);
 
@@ -1726,10 +1727,10 @@ static int fd_get_window_size(int fd, Uint32 *width, Uint32 *height)
     return -1;
 }
 
-static int fd_control(ErlDrvData drv_data,
-		      unsigned int command,
-		      char *buf, int len,
-		      char **rbuf, int rlen)
+static ErlDrvSSizeT fd_control(ErlDrvData drv_data,
+			       unsigned int command,
+			       char *buf, ErlDrvSizeT len,
+			       char **rbuf, ErlDrvSizeT rlen)
 {
     int fd = (int)(long)drv_data;
     char resbuff[2*sizeof(Uint32)];
@@ -2001,18 +2002,20 @@ static void outputv(ErlDrvData e, ErlIOVec* ev)
     int ix = driver_data[fd].port_num;
     int pb = driver_data[fd].packet_bytes;
     int ofd = driver_data[fd].ofd;
-    int n;
-    int sz;
+    ssize_t n;
+    ErlDrvSizeT sz;
     char lb[4];
     char* lbp;
-    int len = ev->size;
+    ErlDrvSizeT len = ev->size;
 
     /* (len > ((unsigned long)-1 >> (4-pb)*8)) */
+    /*    if (pb >= 0 && (len & (((ErlDrvSizeT)1 << (pb*8))) - 1) != len) {*/
     if (((pb == 2) && (len > 0xffff)) || (pb == 1 && len > 0xff)) {
 	driver_failure_posix(ix, EINVAL);
 	return; /* -1; */
     }
-    put_int32(len, lb);
+    /* Handles 0 <= pb <= 4 only */
+    put_int32((Uint32) len, lb);
     lbp = lb + (4-pb);
 
     ev->iov[0].iov_base = lbp;
@@ -2043,14 +2046,14 @@ static void outputv(ErlDrvData e, ErlIOVec* ev)
 }
 
 
-static void output(ErlDrvData e, char* buf, int len)
+static void output(ErlDrvData e, char* buf, ErlDrvSizeT len)
 {
     int fd = (int)(long)e;
     int ix = driver_data[fd].port_num;
     int pb = driver_data[fd].packet_bytes;
     int ofd = driver_data[fd].ofd;
-    int n;
-    int sz;
+    ssize_t n;
+    ErlDrvSizeT sz;
     char lb[4];
     char* lbp;
     struct iovec iv[2];