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, 12 insertions, 12 deletions

diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index d64ec2e97b..643357263c 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -47,8 +47,8 @@
 	 fd_change/1,
 	 steal_control/1,
 	 otp_6602/1,
-	 'driver_system_info_ver1.0'/1,
-	 'driver_system_info_ver1.1'/1,
+	 driver_system_info_base_ver/1,
+	 driver_system_info_prev_ver/1,
 	 driver_system_info_current_ver/1,
 	 driver_monitor/1,
 	
@@ -135,8 +135,8 @@ all() ->
     [outputv_errors, outputv_echo, queue_echo, {group, timer},
      driver_unloaded, io_ready_exit, use_fallback_pollset,
      bad_fd_in_pollset, driver_event, fd_change,
-     steal_control, otp_6602, 'driver_system_info_ver1.0',
-     'driver_system_info_ver1.1',
+     steal_control, otp_6602, driver_system_info_base_ver,
+     driver_system_info_prev_ver,
      driver_system_info_current_ver, driver_monitor,
      {group, ioq_exit}, zero_extended_marker_garb_drv,
      invalid_extended_marker_drv, larger_major_vsn_drv,
@@ -1083,19 +1083,19 @@ otp_6602(Config) when is_list(Config) ->
 
 -define(EXPECTED_SYSTEM_INFO_NAMES, ?EXPECTED_SYSTEM_INFO_NAMES2).
 
-'driver_system_info_ver1.0'(doc) ->    
+'driver_system_info_base_ver'(doc) ->
     [];
-'driver_system_info_ver1.0'(suite) ->
+'driver_system_info_base_ver'(suite) ->
     [];
-'driver_system_info_ver1.0'(Config) when is_list(Config) ->
-    ?line driver_system_info_test(Config, sys_info_1_0_drv).
+'driver_system_info_base_ver'(Config) when is_list(Config) ->
+    ?line driver_system_info_test(Config, sys_info_base_drv).
 
-'driver_system_info_ver1.1'(doc) ->    
+'driver_system_info_prev_ver'(doc) ->
     [];
-'driver_system_info_ver1.1'(suite) ->
+'driver_system_info_prev_ver'(suite) ->
     [];
-'driver_system_info_ver1.1'(Config) when is_list(Config) ->
-    ?line driver_system_info_test(Config, sys_info_1_1_drv).
+'driver_system_info_prev_ver'(Config) when is_list(Config) ->
+    ?line driver_system_info_test(Config, sys_info_prev_drv).
 
 driver_system_info_current_ver(doc) ->    
     [];