Diffstat (limited to 'noncore/settings/networksettings2/usb') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/usb/usb_NN.cpp | 23 | ||||
-rw-r--r-- | noncore/settings/networksettings2/usb/usb_NN.h | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings2/usb/usb_NNI.cpp | 35 | ||||
-rw-r--r-- | noncore/settings/networksettings2/usb/usb_NNI.h | 18 |
4 files changed, 31 insertions, 52 deletions
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp index c10a09c..14c479a 100644 --- a/noncore/settings/networksettings2/usb/usb_NN.cpp +++ b/noncore/settings/networksettings2/usb/usb_NN.cpp | |||
@@ -36,31 +36,8 @@ const char ** USBNetNode::needs( void ) { | |||
36 | const char * USBNetNode::provides( void ) { | 36 | const char * USBNetNode::provides( void ) { |
37 | return "device"; | 37 | return "device"; |
38 | } | 38 | } |
39 | 39 | ||
40 | bool USBNetNode::generateProperFilesFor( | ||
41 | ANetNodeInstance * ) { | ||
42 | return 0; | ||
43 | } | ||
44 | |||
45 | bool USBNetNode::hasDataFor( const QString & S ) { | ||
46 | return (S== "interfaces"); | ||
47 | } | ||
48 | |||
49 | bool USBNetNode::generateDeviceDataForCommonFile( | ||
50 | SystemFile & S , | ||
51 | long DevNr ) { | ||
52 | QString NIC = genNic( DevNr ); | ||
53 | |||
54 | if( S.name() == "interfaces" ) { | ||
55 | // generate mapping stanza for this interface | ||
56 | S << "# check if " << NIC << " can be brought UP" << endl; | ||
57 | S << "mapping " << NIC << endl; | ||
58 | S << " script networksettings2-request" << endl << endl; | ||
59 | } | ||
60 | return 0; | ||
61 | } | ||
62 | |||
63 | QString USBNetNode::genNic( long ) { | 40 | QString USBNetNode::genNic( long ) { |
64 | return QString( "usbf" ); | 41 | return QString( "usbf" ); |
65 | } | 42 | } |
66 | 43 | ||
diff --git a/noncore/settings/networksettings2/usb/usb_NN.h b/noncore/settings/networksettings2/usb/usb_NN.h index fea89f0..73da15a 100644 --- a/noncore/settings/networksettings2/usb/usb_NN.h +++ b/noncore/settings/networksettings2/usb/usb_NN.h | |||
@@ -17,19 +17,12 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "Devices/usb"; } | 18 | { return "Devices/usb"; } |
19 | 19 | ||
20 | virtual const QString nodeDescription() ; | 20 | virtual const QString nodeDescription() ; |
21 | |||
22 | virtual ANetNodeInstance * createInstance( void ); | 21 | virtual ANetNodeInstance * createInstance( void ); |
23 | |||
24 | virtual const char ** needs( void ); | 22 | virtual const char ** needs( void ); |
25 | virtual const char * provides( void ); | 23 | virtual const char * provides( void ); |
26 | 24 | ||
27 | virtual bool generateProperFilesFor( ANetNodeInstance * NNI ); | ||
28 | virtual bool hasDataFor( const QString & S); | ||
29 | virtual bool generateDeviceDataForCommonFile( | ||
30 | SystemFile & SF, long DevNr ); | ||
31 | |||
32 | virtual QString genNic( long nr ); | 25 | virtual QString genNic( long nr ); |
33 | 26 | ||
34 | private: | 27 | private: |
35 | 28 | ||
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.cpp b/noncore/settings/networksettings2/usb/usb_NNI.cpp index e90204c..50c6e8d 100644 --- a/noncore/settings/networksettings2/usb/usb_NNI.cpp +++ b/noncore/settings/networksettings2/usb/usb_NNI.cpp | |||
@@ -31,22 +31,31 @@ void AUSB::commit( void ) { | |||
31 | setModified( 1 ); | 31 | setModified( 1 ); |
32 | } | 32 | } |
33 | } | 33 | } |
34 | 34 | ||
35 | bool AUSB::hasDataFor( const QString & S ) { | 35 | short AUSB::generateFileEmbedded( const QString & ID, |
36 | return (S== "interfaces"); | 36 | const QString & Path, |
37 | } | 37 | QTextStream & TS, |
38 | 38 | long DevNr ) { | |
39 | bool AUSB::generateDataForCommonFile( SystemFile & S, long DevNr ) { | 39 | |
40 | QString NIC = runtime()->device()->netNode()->nodeClass()->genNic( DevNr ); | 40 | QString NIC = runtime()->device()->netNode()->nodeClass()->genNic( DevNr ); |
41 | short rvl, rvd; | ||
42 | |||
43 | rvl = 1; | ||
41 | 44 | ||
42 | if( S.name() == "interfaces" ) { | 45 | if( ID == "interfaces" ) { |
46 | Log(("Generate USB for %s\n", ID.latin1() )); | ||
43 | // generate mapping stanza for this interface | 47 | // generate mapping stanza for this interface |
44 | S << " pre-up " | 48 | TS << " pre-up " |
45 | << QPEApplication::qpeDir() | 49 | << QPEApplication::qpeDir() |
46 | << "bin/setmacaddress.sh " | 50 | << "bin/setmacaddress.sh " |
47 | << NIC | 51 | << NIC |
48 | << " || true" | 52 | << " || true" |
49 | << endl; | 53 | << endl; |
54 | rvl = 0; | ||
50 | } | 55 | } |
51 | return 0; | 56 | rvd = ANetNodeInstance::generateFileEmbedded( ID, Path, TS, DevNr ); |
57 | |||
58 | return (rvd == 2 || rvl == 2 ) ? 2 : | ||
59 | (rvd == 0 || rvl == 0 ) ? 0 : 1; | ||
60 | |||
52 | } | 61 | } |
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.h b/noncore/settings/networksettings2/usb/usb_NNI.h index d2ee217..fcdfd91 100644 --- a/noncore/settings/networksettings2/usb/usb_NNI.h +++ b/noncore/settings/networksettings2/usb/usb_NNI.h | |||
@@ -13,24 +13,24 @@ class AUSB : public ANetNodeInstance { | |||
13 | public : | 13 | public : |
14 | 14 | ||
15 | AUSB( USBNetNode * PNN ); | 15 | AUSB( USBNetNode * PNN ); |
16 | 16 | ||
17 | RuntimeInfo * runtime( void ) | ||
18 | { return | ||
19 | ( RT ) ? RT : ( RT = new USBRun( this, Data ) ); | ||
20 | } | ||
21 | |||
17 | QWidget * edit( QWidget * parent ); | 22 | QWidget * edit( QWidget * parent ); |
18 | QString acceptable( void ); | 23 | QString acceptable( void ); |
19 | void commit( void ); | 24 | void commit( void ); |
20 | 25 | ||
21 | RuntimeInfo * runtime( void ) | ||
22 | { if( RT == 0 ) | ||
23 | RT = new USBRun( this, Data ); | ||
24 | return RT; | ||
25 | } | ||
26 | |||
27 | virtual void * data( void ) | 26 | virtual void * data( void ) |
28 | { return (void *)&Data; } | 27 | { return (void *)&Data; } |
29 | 28 | ||
30 | virtual bool hasDataFor( const QString & S); | 29 | virtual short generateFileEmbedded( const QString & ID, |
31 | virtual bool generateDataForCommonFile( | 30 | const QString & Path, |
32 | SystemFile & SF, long DevNr ); | 31 | QTextStream & TS, |
32 | long DevNr ); | ||
33 | 33 | ||
34 | protected : | 34 | protected : |
35 | 35 | ||
36 | virtual void setSpecificAttribute( QString & Attr, QString & Value ); | 36 | virtual void setSpecificAttribute( QString & Attr, QString & Value ); |