6 files changed, 43 insertions, 8 deletions

diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index c65771d..be4a2bc 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -42,7 +42,7 @@ bool USBNetNode::generateProperFilesFor(
       return 1;
 }
 
-bool USBNetNode::hasDataFor( const QString & S ) {
+bool USBNetNode::hasDataFor( const QString & S, bool ) {
       return (S== "interfaces");
 }
 
@@ -53,6 +53,13 @@ bool USBNetNode::generateDataForCommonFile(
       return ((AUSB *)NNI)->generateDataForCommonFile(S, DevNr);
 }
 
+bool USBNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & S , 
+                                long DevNr,
+                                ANetNodeInstance * NNI) {
+      return ((AUSB *)NNI)->generateDeviceDataForCommonFile(S, DevNr);
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new USBNetNode() );
diff --git a/noncore/settings/networksettings2/usb/usb_NN.h b/noncore/settings/networksettings2/usb/usb_NN.h
index 8b97452..8ff5289 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.h
+++ b/noncore/settings/networksettings2/usb/usb_NN.h
@@ -28,9 +28,11 @@ public:
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DeviceSpec );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
 private:
 
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.cpp b/noncore/settings/networksettings2/usb/usb_NNI.cpp
index 4729416..6fcd6d5 100644
--- a/noncore/settings/networksettings2/usb/usb_NNI.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NNI.cpp
@@ -43,4 +43,15 @@ bool AUSB::generateDataForCommonFile( SystemFile & S, long DevNr ) {
     return 0;
 }
 
+bool AUSB::generateDeviceDataForCommonFile( SystemFile & S, long DevNr ) {
+    AsDevice * Dev = runtime()->device();
+    QString NIC = Dev->genNic( DevNr );
 
+    if( S.name() == "interfaces" ) {
+      // generate mapping stanza for this interface
+      S << "# check if " << NIC << " can be brought UP" << endl;
+      S << "mapping " << NIC << endl;
+      S << "  script networksettings2-request" << endl << endl;
+    }
+    return 0;
+}
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.h b/noncore/settings/networksettings2/usb/usb_NNI.h
index b09f17a..5dead36 100644
--- a/noncore/settings/networksettings2/usb/usb_NNI.h
+++ b/noncore/settings/networksettings2/usb/usb_NNI.h
@@ -28,6 +28,7 @@ public :
         { return (void *)&Data; }
 
       bool generateDataForCommonFile( SystemFile & S, long DevNr );
+      bool generateDeviceDataForCommonFile( SystemFile & S, long DevNr );
 
 protected :
 
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp
index 49b5a77..3007e79 100644
--- a/noncore/settings/networksettings2/usb/usbrun.cpp
+++ b/noncore/settings/networksettings2/usb/usbrun.cpp
@@ -34,8 +34,17 @@ void USBRun::detectState( NodeCollection * NC ) {
       }
     } 
 
-    fprintf( stderr, "NUP\n" );
-    // definitively not up
+    fprintf( stderr, "Assigned %p\n", assignedInterface() );
+    if( ( Run = assignedInterface() ) ) {
+      // we already have an interface assigned -> still present ?
+      if( ! Run->IsUp ) {
+        // usb is still free -> keep assignment
+        NC->setCurrentState( Available );
+        return;
+      } // else interface is up but NOT us -> some other profile
+    }
+
+    // nothing (valid) assigned to us
     assignInterface( 0 );
 
     // find possible interface
@@ -43,16 +52,18 @@ void USBRun::detectState( NodeCollection * NC ) {
          It.current();
          ++It ) {
       Run = It.current();
+
       fprintf( stderr, "%s %d %d=%d %d\n",
       Run->Name.latin1(),
       handlesInterface( Run->Name ),
           Run->CardType, ARPHRD_ETHER,
           ! Run->IsUp );
+
       if( handlesInterface( Run->Name ) &&
           Run->CardType == ARPHRD_ETHER &&
           ! Run->IsUp
         ) {
-        fprintf( stderr, "OFF\n" );
+        fprintf( stderr, "Released(OFF)\n" );
         // proper type, and Not UP -> free
         NC->setCurrentState( Off );
         return;
@@ -83,6 +94,7 @@ bool USBRun::setState( NodeCollection * NC, Action_t A ) {
           // we get back is NOT assigned
           N->assignNode( netNode() );
           assignInterface( N );
+          fprintf( stderr, "Assing %p\n", N );
           NC->setCurrentState( Available );
           return 1;
         }
@@ -92,8 +104,7 @@ bool USBRun::setState( NodeCollection * NC, Action_t A ) {
           if( ! connection()->setState( Down ) )
             // could not ...
             return 0;
-        }
-        if( NC->currentState() != Available ) {
+        } else if( NC->currentState() != Available ) {
           return 1;
         }
         assignedInterface()->assignNode( 0 ); // release
diff --git a/noncore/settings/networksettings2/usb/usbrun.h b/noncore/settings/networksettings2/usb/usbrun.h
index c9c9121..60f9fe8 100644
--- a/noncore/settings/networksettings2/usb/usbrun.h
+++ b/noncore/settings/networksettings2/usb/usbrun.h
@@ -18,9 +18,12 @@ public :
       virtual long count( void )
         { return 1; }
       virtual QString genNic( long nr );
+
       virtual AsDevice * device( void ) 
-        { return asDevice(); }
+        { return (AsDevice *)this; }
 
+      virtual AsDevice * asDevice( void ) 
+        { return (AsDevice *)this; }
 protected :
 
       void detectState( NodeCollection * );