Remove all modules relating to drivers and make all functions obsolete.

8 files changed, 9 insertions, 327 deletions

diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
index f4dc7d178d..3a59773d93 100644
--- a/lib/asn1/src/Makefile
+++ b/lib/asn1/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2011. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -68,7 +68,6 @@ RT_MODULES= \
 	asn1rt_per_bin_rt2ct \
 	asn1rt_uper_bin \
 	asn1rt_check \
-	asn1rt_driver_handler \
 	asn1rt_nif
 #	asn1_sup \
 #	asn1_app \
diff --git a/lib/asn1/src/asn1.app.src b/lib/asn1/src/asn1.app.src
index f59760a4ea..09144ba2f7 100644
--- a/lib/asn1/src/asn1.app.src
+++ b/lib/asn1/src/asn1.app.src
@@ -9,13 +9,11 @@
 	asn1rt_ber_bin,
 	asn1rt_ber_bin_v2,
 	asn1rt_check,
-	asn1rt_driver_handler,
         asn1rt_nif
              ]},
   {registered, [
 	asn1_ns,
-	asn1db,
-	asn1_driver_owner
+	asn1db
 		]},
   {env, []},
   {applications, [kernel, stdlib]}
diff --git a/lib/asn1/src/asn1_app.erl b/lib/asn1/src/asn1_app.erl
index 2d3eed1743..9fff96e0bf 100644
--- a/lib/asn1/src/asn1_app.erl
+++ b/lib/asn1/src/asn1_app.erl
@@ -28,7 +28,7 @@
 %%                             {error, Reason}
 %%
 start(_Type, _StartArgs) ->
-    asn1_sup:start_link().
+    {ok, self()}.
 
 %% stop(State)
 %%
diff --git a/lib/asn1/src/asn1_server.erl b/lib/asn1/src/asn1_server.erl
deleted file mode 100644
index aeb59d8b0c..0000000000
--- a/lib/asn1/src/asn1_server.erl
+++ /dev/null
@@ -1,107 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved via the world wide web at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id$
-%%
-
-%% Purpose: Provide complete encode/and pre-decode of asn1.
--module(asn1_server).
-
-
-
--behaviour(gen_server).
-
--export([start_link/0,client_port/0]).
-
-%% Internal exports, call-back functions.
--export([init/1,handle_call/3,handle_cast/2,handle_info/2,code_change/3,
-	 terminate/2]).
-
-
-%% Macros
--define(port_names,
-	{ asn1_drv01, asn1_drv02, asn1_drv03, asn1_drv04,
-	  asn1_drv05, asn1_drv06, asn1_drv07, asn1_drv08,
-	  asn1_drv09, asn1_drv10, asn1_drv11, asn1_drv12,
-	  asn1_drv13, asn1_drv14, asn1_drv15, asn1_drv16 }).
-%%% --------------------------------------------------------
-%%% Interface Functions. 
-%%% --------------------------------------------------------
-
-start_link() ->
-    gen_server:start_link({local, asn1_server}, asn1_server, [], []).
-
-init([]) ->
-    process_flag(trap_exit, true),
-    erl_ddll:start(),
-    PrivDir = code:priv_dir(asn1),
-    LibDir1 = filename:join([PrivDir, "lib"]),
-    case erl_ddll:load_driver(LibDir1, asn1_erl_drv) of
-	ok -> ok;
-	{error,_} ->
-	    LibDir2 = 
-		filename:join(LibDir1, 
-			      erlang:system_info(system_architecture)),
-	    erl_ddll:load_driver(LibDir2, asn1_erl_drv)
-    end,
-    open_ports("asn1_erl_drv",size(?port_names)).
-
-open_ports(_,0) ->
-    {ok, []};
-open_ports(Cmd,N) ->   
-    Port = open_port({spawn, Cmd}, []),
-    %% check that driver is loaded, linked and working
-    case catch port_control(Port, 0, []) of
-	{'EXIT', _} ->
-	    {stop, nodriver};
-	_ ->
-	    register(element(N,?port_names), Port),
-	    open_ports(Cmd,N-1)
-    end.
-
-client_port() ->
-    element(erlang:system_info(scheduler_id) rem size(?port_names) + 1,
-	    ?port_names).
-
-
-%%% --------------------------------------------------------
-%%% The call-back functions.
-%%% --------------------------------------------------------
-
-handle_call(_, _, State) ->
-    {noreply, State}.
-
-handle_cast(_, State) ->
-    {noreply, State}.
-
-handle_info({'EXIT', Pid, _Reason}, State) when is_pid(Pid) ->
-    {noreply, State};
-
-handle_info({'EXIT', Port, Reason}, State) when is_port(Port) ->
-    {stop, {port_died, Reason}, State};
-handle_info(_, State) ->
-    {noreply, State}.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-terminate(_Reason, _State) ->
-    close_ports(size(?port_names)).
-
-close_ports(0) ->
-    ok;
-close_ports(N) ->   
-    element(N,?port_names) ! {self(), close}, %% almost same as port_close(Name)
-    close_ports(N-1).
diff --git a/lib/asn1/src/asn1_sup.erl b/lib/asn1/src/asn1_sup.erl
deleted file mode 100644
index a241dec6f4..0000000000
--- a/lib/asn1/src/asn1_sup.erl
+++ /dev/null
@@ -1,37 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved via the world wide web at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id$
-%%
-
-%% Purpose: Main supervisor in asn1 application.
-
--module(asn1_sup).
-
--behaviour(supervisor).
-
--export([start_link/0, init/1]).
-
-start_link() ->
-    supervisor:start_link({local, asn1_sup}, asn1_sup, []).
-
-
-%% init([])
-%% Returns: {ok,  {SupFlags,  [ChildSpec]}}
-%%
-init([]) ->
-    Child = {asn1_server, {asn1_server, start_link, []},
-	     permanent, 2000, worker, [asn1_server]},
-    {ok, {{one_for_all, 10, 3600}, [Child]}}.
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 91930993f4..a664c8d343 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -1086,8 +1086,7 @@ get_runtime_mod(Options) ->
 	    ber_bin_v2 -> ["asn1rt_ber_bin_v2.erl"];
 	    uper_bin -> ["asn1rt_uper_bin.erl"]
 	end,
-    RtMod1++["asn1rt_check.erl","asn1rt_driver_handler.erl",
-	     "asn1rt.erl"].
+    RtMod1++["asn1rt_check.erl","asn1rt.erl"].
     
 
 erl_compile(OutFile,Options) ->
diff --git a/lib/asn1/src/asn1rt.erl b/lib/asn1/src/asn1rt.erl
index 9ef68efab5..12f3e34edc 100644
--- a/lib/asn1/src/asn1rt.erl
+++ b/lib/asn1/src/asn1rt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -46,38 +46,12 @@ decode(Module,Type,Bytes) ->
 	    Result
     end.
 
-%% asn1-1.6.8.1	
-%% load_driver() ->
-%%     asn1rt_driver_handler:load_driver(),
-%%     receive
-%% 	driver_ready ->
-%% 	    ok;
-%% 	Err={error,_Reason} ->
-%% 	    Err;
-%% 	Error ->
-%% 	    {error,Error}
-%%     end.
-
-%% asn1-1.6.9
- load_driver() ->
-     case catch asn1rt_driver_handler:load_driver() of
- 	ok ->
- 	    ok;
- 	{error,{already_started,asn1}} ->
- 	    ok;
- 	Err ->
- 	    {error,Err}
-     end.
-
+%% Remove in R16A
+load_driver() ->
+    ok.
 
 unload_driver() ->
-    case catch asn1rt_driver_handler:unload_driver() of
-	ok ->
-	    ok;
-	Error ->
-	    {error,Error}
-    end.
-
+    ok.
 
 info(Module) ->
     case catch apply(Module,info,[]) of
diff --git a/lib/asn1/src/asn1rt_driver_handler.erl b/lib/asn1/src/asn1rt_driver_handler.erl
deleted file mode 100644
index 146d0043f9..0000000000
--- a/lib/asn1/src/asn1rt_driver_handler.erl
+++ /dev/null
@@ -1,144 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(asn1rt_driver_handler).
-
--include("asn1_records.hrl").
-
--export([load_driver/0,unload_driver/0,client_port/0]).
-
-%% Internal exports
--export([init/2]).
-
-%% Macros
--define(port_names,
-	{ asn1_drv01, asn1_drv02, asn1_drv03, asn1_drv04,
-	  asn1_drv05, asn1_drv06, asn1_drv07, asn1_drv08,
-	  asn1_drv09, asn1_drv10, asn1_drv11, asn1_drv12,
-	  asn1_drv13, asn1_drv14, asn1_drv15, asn1_drv16 }).
-
-%%% --------------------------------------------------------
-%%% Interface Functions. 
-%%% --------------------------------------------------------
-load_driver() ->
-    load_driver(noreason).
-
-load_driver(Reason) ->
-    Ref = make_ref(),
-    case whereis(asn1_driver_owner) of % to prevent unnecessary spawn
-	Pid when is_pid(Pid) ->
-	    asn1_driver_owner ! {self(),Ref,are_you_ready},
-	    receive
-		{Ref,driver_ready} ->
-		    ok
-	    after 10000 ->
-		    {error,{timeout,waiting_for_drivers}}
-	    end;
-	_ ->
-	    {_,Mref} = spawn_monitor(asn1rt_driver_handler, init, [self(),Ref]),
-	    receive
-		{'DOWN', Mref, _, _, NewReason} ->
-		    case NewReason of
-			Reason -> {error,Reason};
-			_ -> load_driver(NewReason)
-		    end;
-		{Ref,driver_ready} ->
-		    erlang:demonitor(Mref),
-		    ok;
-		{Ref,Error = {error,_Reason}} ->
-		    erlang:demonitor(Mref),
-		    Error
-	    after 10000 -> %% 10 seconds
-		    {error,{timeout,waiting_for_drivers}}
-	    end
-    end.
-
-init(FromPid,FromRef) ->
-    case catch register(asn1_driver_owner,self()) of
-	true -> true;
-	_Other -> exit(normal)
-    end,
-    Dir = filename:join([code:priv_dir(asn1),"lib"]),
-    case catch erl_ddll:load_driver(Dir,asn1_erl_drv) of
-	ok ->
-	    Result = open_named_ports(),
-	    catch (FromPid ! {FromRef,Result}),
-	    loop(Result);
-	{error,Err} -> % if erl_ddll:load_driver fails
-	    ForErr = erl_ddll:format_error(Err),
-	    OSDir = filename:join(Dir,erlang:system_info(system_architecture)),
-	    case catch erl_ddll:load_driver(OSDir,asn1_erl_drv) of
-		ok ->
-		    Result = open_named_ports(),
-		    catch (FromPid ! {FromRef,Result}),
-		    loop(Result);
-		{error,Err2} ->
-%		    catch (FromPid ! {FromRef,Error})
-		    ForErr2 = erl_ddll:format_error(Err2),
-		    catch (FromPid ! {FromRef,{error,{{Dir,ForErr},{OSDir,ForErr2}}}})
-	    end
-    end.
-
-    
-open_named_ports() ->
-    open_named_ports(size(?port_names)).
-
-open_named_ports(0) ->
-    driver_ready;
-open_named_ports(N) ->
-    case catch open_port({spawn,"asn1_erl_drv"},[]) of
-	{'EXIT',Reason} ->
-	    {error,{port_error,Reason}};
-	Port ->
-	    register(element(N,?port_names),Port),
-	    open_named_ports(N-1)
-    end.
-
-loop(Result) ->
-    receive
-	{_FromPid,_FromRef,unload} ->
-	    close_ports(size(?port_names)),
-	    erl_ddll:unload_driver(asn1_erl_drv),
-	    ok;
-	{FromPid,FromRef,are_you_ready} ->
-	    catch (FromPid ! {FromRef,driver_ready}),
-	    loop(Result);
-	_ ->
-	    loop(Result)
-    end.
-
-unload_driver() ->
-    case whereis(asn1_driver_owner) of
-	Pid when is_pid(Pid) ->
-	    Pid ! {self(),make_ref(),unload},
-	    ok;
-	_ -> 
-	    ok
-    end.
-
-close_ports(0) ->
-    ok;
-close_ports(N) ->   
-    element(N,?port_names) ! {self(), close}, %% almost same as port_close(Name)
-    close_ports(N-1).
-
-client_port() ->
-    element(erlang:system_info(scheduler_id) rem size(?port_names) + 1,
-	    ?port_names).