diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c --- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c +++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c @@ -1823,19 +1823,19 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -int driver_init (void) { +int avm_driver_init (void) { return (NULL != (capi_lib = link_library (&capi_card))); -} /* driver_init */ +} /* avm_driver_init */ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -void driver_exit (void) { +void avm_driver_exit (void) { assert (capi_lib != NULL); free_library (); capi_lib = NULL; -} /* driver_exit */ +} /* avm_driver_exit */ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h --- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h +++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h @@ -23,7 +23,7 @@ #ifndef __have_driver_h__ #define __have_driver_h__ -#include +#include #include #include #include @@ -139,8 +139,8 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -extern int driver_init (void); -extern void driver_exit (void); +extern int avm_driver_init (void); +extern void avm_driver_exit (void); #endif diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c --- usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c +++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -115,14 +115,14 @@ return -ENODEV; } NOTE( "Loading...\n"); - if (!driver_init ()) { + if (!avm_driver_init ()) { ERROR("Error: Driver library not available.\n"); ERROR("Not loaded.\n"); return -ENOSYS; } if (0 != (res = add_card (dev))) { ERROR("Not loaded.\n"); - driver_exit (); + avm_driver_exit (); return res; } NOTE("Loaded.\n"); @@ -143,7 +143,7 @@ NOTE("Removing...\n"); remove_ctrls (card); NOTE("Removed.\n"); - driver_exit (); + avm_driver_exit (); #ifndef NDEBUG if (hallocated() != 0) { ERROR( "%u bytes leaked.\n", hallocated()); diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c --- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c +++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c @@ -1576,19 +1576,19 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -int driver_init (void) { +int avm_driver_init (void) { return (NULL != (capi_lib = link_library (&capi_card))); -} /* driver_init */ +} /* avm_driver_init */ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -void driver_exit (void) { +void avm_driver_exit (void) { assert (capi_lib); free_library (); capi_lib = NULL; -} /* driver_exit */ +} /* avm_driver_exit */ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h --- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h +++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h @@ -24,7 +24,7 @@ #define __have_driver_h__ #include -#include +#include #include #include #include @@ -161,8 +161,8 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -extern int driver_init (void); -extern void driver_exit (void); +extern int avm_driver_init (void); +extern void avm_driver_exit (void); #endif diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c --- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c +++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -116,14 +116,14 @@ return -ENODEV; } NOTE("Loading...\n"); - if (!driver_init ()) { + if (!avm_driver_init ()) { ERROR("Error: Driver library not available.\n"); NOTE("Not loaded.\n"); return -ENOSYS; } if (0 != (res = add_card (dev))) { NOTE("Not loaded.\n"); - driver_exit (); + avm_driver_exit (); return res; } NOTE("Loaded.\n"); @@ -144,7 +144,7 @@ NOTE("Removing...\n"); remove_ctrls (cp); NOTE("Removed.\n"); - driver_exit (); + avm_driver_exit (); #ifndef NDEBUG if (hallocated() != 0) { ERROR("%u bytes leaked.\n", hallocated()); diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c --- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c +++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c @@ -1577,19 +1577,19 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -int driver_init (void) { +int avm_driver_init (void) { return (NULL != (capi_lib = link_library (&capi_card))); -} /* driver_init */ +} /* avm_driver_init */ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -void driver_exit (void) { +void avm_driver_exit (void) { assert (capi_lib); free_library (); capi_lib = NULL; -} /* driver_exit */ +} /* avm_driver_exit */ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h --- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h +++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h @@ -24,7 +24,7 @@ #define __have_driver_h__ #include -#include +#include #include #include #include @@ -161,8 +161,8 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -extern int driver_init (void); -extern void driver_exit (void); +extern int avm_driver_init (void); +extern void avm_driver_exit (void); #endif diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c --- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c +++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -116,14 +116,14 @@ return -ENODEV; } NOTE("Loading...\n"); - if (!driver_init ()) { + if (!avm_driver_init ()) { ERROR("Error: Driver library not available.\n"); NOTE("Not loaded.\n"); return -ENOSYS; } if (0 != (res = add_card (dev))) { NOTE("Not loaded.\n"); - driver_exit (); + avm_driver_exit (); return res; } NOTE("Loaded.\n"); @@ -144,7 +144,7 @@ NOTE("Removing...\n"); remove_ctrls (cp); NOTE("Removed.\n"); - driver_exit (); + avm_driver_exit (); #ifndef NDEBUG if (hallocated() != 0) { ERROR("%u bytes leaked.\n", hallocated()); diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h --- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h +++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h @@ -24,7 +24,7 @@ #define __have_driver_h__ #include -#include +#include #include #include #include diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c --- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c +++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h --- usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h +++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h --- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h +++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h @@ -24,7 +24,7 @@ #define __have_driver_h__ #include -#include +#include #include #include #include diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c --- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c +++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h --- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h +++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h @@ -24,7 +24,7 @@ #define __have_driver_h__ #include -#include +#include #include #include #include diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c --- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c +++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include