[PATCH rtems-net-legacy 1/2] Remove RTEMS_NETWORKING checks
* Remove nfsclient wscript and build from netlegacy.py --- bsps/powerpc/mpc55xxevb/net/smsc9218i.c | 4 +-- libmisc/dummy-networking.c | 44 - netlegacy.py| 17 +- nfsclient/wscript | 1 + telnetd/telnetd.c | 4 --- wscript | 2 +- 6 files changed, 41 insertions(+), 31 deletions(-) diff --git a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c index d88aa8a..384f9cd 100644 --- a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c +++ b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c @@ -24,7 +24,7 @@ #include -#if defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) +#if defined(MPC55XX_HAS_SIU) #include @@ -2121,4 +2121,4 @@ int smsc9218i_attach_detach( return 0; } -#endif /* defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) */ +#endif /* defined(MPC55XX_HAS_SIU) */ diff --git a/libmisc/dummy-networking.c b/libmisc/dummy-networking.c index 379e23e..b7f15c8 100644 --- a/libmisc/dummy-networking.c +++ b/libmisc/dummy-networking.c @@ -16,27 +16,25 @@ #include /* Loopback Network Configuration */ -#if defined(RTEMS_NETWORKING) - #include - #include - #include +#include +#include +#include - struct rtems_bsdnet_config rtems_bsdnet_config = { - NULL, /* Network interface */ - NULL, /* Use fixed network configuration */ - 0, /* Default network task priority */ - 0, /* Default mbuf capacity */ - 0, /* Default mbuf cluster capacity */ - "testSystem", /* Host name */ - "nowhere.com", /* Domain name */ - "127.0.0.1",/* Gateway */ - "127.0.0.1",/* Log host */ - {"127.0.0.1" }, /* Name server(s) */ - {"127.0.0.1" }, /* NTP server(s) */ - 1, /* sb_efficiency */ - 0, /* udp_tx_buf_size */ - 0, /* udp_rx_buf_size */ - 0, /* tcp_tx_buf_size */ - 0 /* tcp_rx_buf_size */ - }; -#endif +struct rtems_bsdnet_config rtems_bsdnet_config = { +NULL, /* Network interface */ +NULL, /* Use fixed network configuration */ +0, /* Default network task priority */ +0, /* Default mbuf capacity */ +0, /* Default mbuf cluster capacity */ +"testSystem", /* Host name */ +"nowhere.com", /* Domain name */ +"127.0.0.1",/* Gateway */ +"127.0.0.1",/* Log host */ +{"127.0.0.1" }, /* Name server(s) */ +{"127.0.0.1" }, /* NTP server(s) */ +1, /* sb_efficiency */ +0, /* udp_tx_buf_size */ +0, /* udp_rx_buf_size */ +0, /* tcp_tx_buf_size */ +0 /* tcp_rx_buf_size */ +}; diff --git a/netlegacy.py b/netlegacy.py index 0889548..0e69076 100644 --- a/netlegacy.py +++ b/netlegacy.py @@ -54,6 +54,12 @@ def build(bld): for s in os.listdir('./pppd') if s[-2:] == '.c'] telnetd_source = [os.path.join('./telnetd', s) for s in os.listdir('telnetd') if s[-2:] == '.c'] +nfs_source = [] +for root, dirs, files in os.walk('./nfsclient'): +for name in files: +if name[-2:] == '.c': +src_root = root.split('/')[2] +nfs_source.append(os.path.join('./nfsclient', src_root, name)) bsp_dirs, bsp_sources = bsp_drivers.bsp_files(bld) @@ -66,6 +72,7 @@ def build(bld): './bsps/include']) arch_lib_path = rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP) +lib_path = os.path.join(bld.env.PREFIX, arch_lib_path) include_path.append(os.path.relpath(os.path.join(bld.env.PREFIX, arch_lib_path))) include_path.append(os.path.relpath(os.path.join(bld.env.PREFIX, @@ -73,6 +80,8 @@ def build(bld): 'include'))) include_path.append('./bsps/include/libchip') +bld.read_stlib('rtemsbsp', paths=[lib_path]) + if bsp in bsp_dirs: include_path.extend(bsp_dirs[bsp]) @@ -107,8 +116,14 @@ def build(bld): use='networking', source=telnetd_source) +bld.stlib(target='nfs', + features='c', + includes=ip, + use=['rtemsbsp', 'networking'], + source=nfs_source) + bld.install_files(os.path.join('${PREFIX}', arch_lib_path), - ["libnetworking.a", 'libpppd.a', 'libtelnetd.a']) +
Re: [PATCH rtems-net-legacy 1/2] Remove RTEMS_NETWORKING checks
ping :) On Tue, Mar 23, 2021 at 2:10 PM Vijay Kumar Banerjee wrote: > > * Remove nfsclient wscript and build from netlegacy.py > --- > bsps/powerpc/mpc55xxevb/net/smsc9218i.c | 4 +-- > libmisc/dummy-networking.c | 44 - > netlegacy.py| 17 +- > nfsclient/wscript | 1 + > telnetd/telnetd.c | 4 --- > wscript | 2 +- > 6 files changed, 41 insertions(+), 31 deletions(-) > > diff --git a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > index d88aa8a..384f9cd 100644 > --- a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > +++ b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > @@ -24,7 +24,7 @@ > > #include > > -#if defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) > +#if defined(MPC55XX_HAS_SIU) > > #include > > @@ -2121,4 +2121,4 @@ int smsc9218i_attach_detach( >return 0; > } > > -#endif /* defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) */ > +#endif /* defined(MPC55XX_HAS_SIU) */ > diff --git a/libmisc/dummy-networking.c b/libmisc/dummy-networking.c > index 379e23e..b7f15c8 100644 > --- a/libmisc/dummy-networking.c > +++ b/libmisc/dummy-networking.c > @@ -16,27 +16,25 @@ > #include > > /* Loopback Network Configuration */ > -#if defined(RTEMS_NETWORKING) > - #include > - #include > - #include > +#include > +#include > +#include > > - struct rtems_bsdnet_config rtems_bsdnet_config = { > - NULL, /* Network interface */ > - NULL, /* Use fixed network configuration */ > - 0, /* Default network task priority */ > - 0, /* Default mbuf capacity */ > - 0, /* Default mbuf cluster capacity */ > - "testSystem", /* Host name */ > - "nowhere.com", /* Domain name */ > - "127.0.0.1",/* Gateway */ > - "127.0.0.1",/* Log host */ > - {"127.0.0.1" }, /* Name server(s) */ > - {"127.0.0.1" }, /* NTP server(s) */ > - 1, /* sb_efficiency */ > - 0, /* udp_tx_buf_size */ > - 0, /* udp_rx_buf_size */ > - 0, /* tcp_tx_buf_size */ > - 0 /* tcp_rx_buf_size */ > - }; > -#endif > +struct rtems_bsdnet_config rtems_bsdnet_config = { > +NULL, /* Network interface */ > +NULL, /* Use fixed network configuration */ > +0, /* Default network task priority */ > +0, /* Default mbuf capacity */ > +0, /* Default mbuf cluster capacity */ > +"testSystem", /* Host name */ > +"nowhere.com", /* Domain name */ > +"127.0.0.1",/* Gateway */ > +"127.0.0.1",/* Log host */ > +{"127.0.0.1" }, /* Name server(s) */ > +{"127.0.0.1" }, /* NTP server(s) */ > +1, /* sb_efficiency */ > +0, /* udp_tx_buf_size */ > +0, /* udp_rx_buf_size */ > +0, /* tcp_tx_buf_size */ > +0 /* tcp_rx_buf_size */ > +}; > diff --git a/netlegacy.py b/netlegacy.py > index 0889548..0e69076 100644 > --- a/netlegacy.py > +++ b/netlegacy.py > @@ -54,6 +54,12 @@ def build(bld): > for s in os.listdir('./pppd') if s[-2:] == '.c'] > telnetd_source = [os.path.join('./telnetd', s) >for s in os.listdir('telnetd') if s[-2:] == '.c'] > +nfs_source = [] > +for root, dirs, files in os.walk('./nfsclient'): > +for name in files: > +if name[-2:] == '.c': > +src_root = root.split('/')[2] > +nfs_source.append(os.path.join('./nfsclient', src_root, > name)) > > bsp_dirs, bsp_sources = bsp_drivers.bsp_files(bld) > > @@ -66,6 +72,7 @@ def build(bld): > './bsps/include']) > arch_lib_path = rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, > bld.env.RTEMS_ARCH_BSP) > +lib_path = os.path.join(bld.env.PREFIX, arch_lib_path) > include_path.append(os.path.relpath(os.path.join(bld.env.PREFIX, > arch_lib_path))) > include_path.append(os.path.relpath(os.path.join(bld.env.PREFIX, > @@ -73,6 +80,8 @@ def build(bld): > 'include'))) > include_path.append('./bsps/include/libchip') > > +bld.read_stlib('rtemsbsp', paths=[lib_path]) > + > if bsp in bsp_dirs: > include_path.extend(bsp_dirs[bsp]) > > @@ -107,8 +116,14 @@ def build(bld): >use='networking', >source=telnetd_source) > > +bld.stlib(target='nfs
Re: [PATCH rtems-net-legacy 1/2] Remove RTEMS_NETWORKING checks
On Mon, Mar 29, 2021 at 7:42 PM Vijay Kumar Banerjee wrote: > > ping :) > > On Tue, Mar 23, 2021 at 2:10 PM Vijay Kumar Banerjee wrote: > > > > * Remove nfsclient wscript and build from netlegacy.py > > --- > > bsps/powerpc/mpc55xxevb/net/smsc9218i.c | 4 +-- > > libmisc/dummy-networking.c | 44 - > > netlegacy.py| 17 +- > > nfsclient/wscript | 1 + > > telnetd/telnetd.c | 4 --- > > wscript | 2 +- > > 6 files changed, 41 insertions(+), 31 deletions(-) > > > > diff --git a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > index d88aa8a..384f9cd 100644 > > --- a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > +++ b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > @@ -24,7 +24,7 @@ > > > > #include > > > > -#if defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) > > +#if defined(MPC55XX_HAS_SIU) > > > > #include > > > > @@ -2121,4 +2121,4 @@ int smsc9218i_attach_detach( > >return 0; > > } > > > > -#endif /* defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) */ > > +#endif /* defined(MPC55XX_HAS_SIU) */ > > diff --git a/libmisc/dummy-networking.c b/libmisc/dummy-networking.c > > index 379e23e..b7f15c8 100644 > > --- a/libmisc/dummy-networking.c > > +++ b/libmisc/dummy-networking.c > > @@ -16,27 +16,25 @@ > > #include > > > > /* Loopback Network Configuration */ > > -#if defined(RTEMS_NETWORKING) > > - #include > > - #include > > - #include > > +#include > > +#include > > +#include > > > > - struct rtems_bsdnet_config rtems_bsdnet_config = { > > - NULL, /* Network interface */ > > - NULL, /* Use fixed network configuration */ > > - 0, /* Default network task priority */ > > - 0, /* Default mbuf capacity */ > > - 0, /* Default mbuf cluster capacity */ > > - "testSystem", /* Host name */ > > - "nowhere.com", /* Domain name */ > > - "127.0.0.1",/* Gateway */ > > - "127.0.0.1",/* Log host */ > > - {"127.0.0.1" }, /* Name server(s) */ > > - {"127.0.0.1" }, /* NTP server(s) */ > > - 1, /* sb_efficiency */ > > - 0, /* udp_tx_buf_size */ > > - 0, /* udp_rx_buf_size */ > > - 0, /* tcp_tx_buf_size */ > > - 0 /* tcp_rx_buf_size */ > > - }; > > -#endif > > +struct rtems_bsdnet_config rtems_bsdnet_config = { > > +NULL, /* Network interface */ > > +NULL, /* Use fixed network configuration */ > > +0, /* Default network task priority */ > > +0, /* Default mbuf capacity */ > > +0, /* Default mbuf cluster capacity */ > > +"testSystem", /* Host name */ > > +"nowhere.com", /* Domain name */ > > +"127.0.0.1",/* Gateway */ > > +"127.0.0.1",/* Log host */ > > +{"127.0.0.1" }, /* Name server(s) */ > > +{"127.0.0.1" }, /* NTP server(s) */ > > +1, /* sb_efficiency */ > > +0, /* udp_tx_buf_size */ > > +0, /* udp_rx_buf_size */ > > +0, /* tcp_tx_buf_size */ > > +0 /* tcp_rx_buf_size */ > > +}; > > diff --git a/netlegacy.py b/netlegacy.py > > index 0889548..0e69076 100644 > > --- a/netlegacy.py > > +++ b/netlegacy.py > > @@ -54,6 +54,12 @@ def build(bld): > > for s in os.listdir('./pppd') if s[-2:] == '.c'] > > telnetd_source = [os.path.join('./telnetd', s) > >for s in os.listdir('telnetd') if s[-2:] == '.c'] > > +nfs_source = [] > > +for root, dirs, files in os.walk('./nfsclient'): > > +for name in files: > > +if name[-2:] == '.c': can you use os.path.splitext() here? You may like to propagate the change elsewhere. > > +src_root = root.split('/')[2] If this is just one level, you can use os.path.split() instead? > > +nfs_source.append(os.path.join('./nfsclient', src_root, > > name)) > > > > bsp_dirs, bsp_sources = bsp_drivers.bsp_files(bld) > > > > @@ -66,6 +72,7 @@ def build(bld): > > './bsps/include']) > > arch_lib_path = rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, > > bld.env.RTEMS_ARCH_BSP) > > +lib_path = os.path.join(bld.env.PREFIX, arch_lib_path) > > include_path.append(os.path.relpath(os.path.join(bld.env.PREFIX, > > arch_lib_path))) > > include_path.append(os.path.relpath(os.path.join(bld.env.PREF
Re: [PATCH rtems-net-legacy 1/2] Remove RTEMS_NETWORKING checks
Hi, On Tue, Mar 30, 2021 at 7:53 AM Gedare Bloom wrote: > > On Mon, Mar 29, 2021 at 7:42 PM Vijay Kumar Banerjee wrote: > > > > ping :) > > > > On Tue, Mar 23, 2021 at 2:10 PM Vijay Kumar Banerjee > > wrote: > > > > > > * Remove nfsclient wscript and build from netlegacy.py > > > --- > > > bsps/powerpc/mpc55xxevb/net/smsc9218i.c | 4 +-- > > > libmisc/dummy-networking.c | 44 - > > > netlegacy.py| 17 +- > > > nfsclient/wscript | 1 + > > > telnetd/telnetd.c | 4 --- > > > wscript | 2 +- > > > 6 files changed, 41 insertions(+), 31 deletions(-) > > > > > > diff --git a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > index d88aa8a..384f9cd 100644 > > > --- a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > +++ b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > @@ -24,7 +24,7 @@ > > > > > > #include > > > > > > -#if defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) > > > +#if defined(MPC55XX_HAS_SIU) > > > > > > #include > > > > > > @@ -2121,4 +2121,4 @@ int smsc9218i_attach_detach( > > >return 0; > > > } > > > > > > -#endif /* defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) */ > > > +#endif /* defined(MPC55XX_HAS_SIU) */ > > > diff --git a/libmisc/dummy-networking.c b/libmisc/dummy-networking.c > > > index 379e23e..b7f15c8 100644 > > > --- a/libmisc/dummy-networking.c > > > +++ b/libmisc/dummy-networking.c > > > @@ -16,27 +16,25 @@ > > > #include > > > > > > /* Loopback Network Configuration */ > > > -#if defined(RTEMS_NETWORKING) > > > - #include > > > - #include > > > - #include > > > +#include > > > +#include > > > +#include > > > > > > - struct rtems_bsdnet_config rtems_bsdnet_config = { > > > - NULL, /* Network interface */ > > > - NULL, /* Use fixed network configuration */ > > > - 0, /* Default network task priority */ > > > - 0, /* Default mbuf capacity */ > > > - 0, /* Default mbuf cluster capacity */ > > > - "testSystem", /* Host name */ > > > - "nowhere.com", /* Domain name */ > > > - "127.0.0.1",/* Gateway */ > > > - "127.0.0.1",/* Log host */ > > > - {"127.0.0.1" }, /* Name server(s) */ > > > - {"127.0.0.1" }, /* NTP server(s) */ > > > - 1, /* sb_efficiency */ > > > - 0, /* udp_tx_buf_size */ > > > - 0, /* udp_rx_buf_size */ > > > - 0, /* tcp_tx_buf_size */ > > > - 0 /* tcp_rx_buf_size */ > > > - }; > > > -#endif > > > +struct rtems_bsdnet_config rtems_bsdnet_config = { > > > +NULL, /* Network interface */ > > > +NULL, /* Use fixed network configuration */ > > > +0, /* Default network task priority */ > > > +0, /* Default mbuf capacity */ > > > +0, /* Default mbuf cluster capacity */ > > > +"testSystem", /* Host name */ > > > +"nowhere.com", /* Domain name */ > > > +"127.0.0.1",/* Gateway */ > > > +"127.0.0.1",/* Log host */ > > > +{"127.0.0.1" }, /* Name server(s) */ > > > +{"127.0.0.1" }, /* NTP server(s) */ > > > +1, /* sb_efficiency */ > > > +0, /* udp_tx_buf_size */ > > > +0, /* udp_rx_buf_size */ > > > +0, /* tcp_tx_buf_size */ > > > +0 /* tcp_rx_buf_size */ > > > +}; > > > diff --git a/netlegacy.py b/netlegacy.py > > > index 0889548..0e69076 100644 > > > --- a/netlegacy.py > > > +++ b/netlegacy.py > > > @@ -54,6 +54,12 @@ def build(bld): > > > for s in os.listdir('./pppd') if s[-2:] == '.c'] > > > telnetd_source = [os.path.join('./telnetd', s) > > >for s in os.listdir('telnetd') if s[-2:] == '.c'] > > > +nfs_source = [] > > > +for root, dirs, files in os.walk('./nfsclient'): > > > +for name in files: > > > +if name[-2:] == '.c': > can you use os.path.splitext() here? You may like to propagate the > change elsewhere. yes, that would be nice. There are some more places in this file where this has been used. Should that be a follow-up patch to update this in all the places? Best regards, Vijay > > > > +src_root = root.split('/')[2] > If this is just one level, you can use os.path.split() instead? > > > > +nfs_source.append(os.path.join('./nfsclient', src_root, > > > name)) > > > > > > bsp_dirs, bsp_sources = bsp_drivers.bsp_files(bld) > > > > > > @@ -66,6 +72,7 @@ def build(bld): > > >
Re: [PATCH rtems-net-legacy 1/2] Remove RTEMS_NETWORKING checks
On Tue, Mar 30, 2021 at 10:40 AM Vijay Kumar Banerjee wrote: > > Hi, > > > On Tue, Mar 30, 2021 at 7:53 AM Gedare Bloom wrote: > > > > On Mon, Mar 29, 2021 at 7:42 PM Vijay Kumar Banerjee > > wrote: > > > > > > ping :) > > > > > > On Tue, Mar 23, 2021 at 2:10 PM Vijay Kumar Banerjee > > > wrote: > > > > > > > > * Remove nfsclient wscript and build from netlegacy.py > > > > --- > > > > bsps/powerpc/mpc55xxevb/net/smsc9218i.c | 4 +-- > > > > libmisc/dummy-networking.c | 44 - > > > > netlegacy.py| 17 +- > > > > nfsclient/wscript | 1 + > > > > telnetd/telnetd.c | 4 --- > > > > wscript | 2 +- > > > > 6 files changed, 41 insertions(+), 31 deletions(-) > > > > > > > > diff --git a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > > b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > > index d88aa8a..384f9cd 100644 > > > > --- a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > > +++ b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > > @@ -24,7 +24,7 @@ > > > > > > > > #include > > > > > > > > -#if defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) > > > > +#if defined(MPC55XX_HAS_SIU) > > > > > > > > #include > > > > > > > > @@ -2121,4 +2121,4 @@ int smsc9218i_attach_detach( > > > >return 0; > > > > } > > > > > > > > -#endif /* defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) */ > > > > +#endif /* defined(MPC55XX_HAS_SIU) */ > > > > diff --git a/libmisc/dummy-networking.c b/libmisc/dummy-networking.c > > > > index 379e23e..b7f15c8 100644 > > > > --- a/libmisc/dummy-networking.c > > > > +++ b/libmisc/dummy-networking.c > > > > @@ -16,27 +16,25 @@ > > > > #include > > > > > > > > /* Loopback Network Configuration */ > > > > -#if defined(RTEMS_NETWORKING) > > > > - #include > > > > - #include > > > > - #include > > > > +#include > > > > +#include > > > > +#include > > > > > > > > - struct rtems_bsdnet_config rtems_bsdnet_config = { > > > > - NULL, /* Network interface */ > > > > - NULL, /* Use fixed network configuration */ > > > > - 0, /* Default network task priority */ > > > > - 0, /* Default mbuf capacity */ > > > > - 0, /* Default mbuf cluster capacity */ > > > > - "testSystem", /* Host name */ > > > > - "nowhere.com", /* Domain name */ > > > > - "127.0.0.1",/* Gateway */ > > > > - "127.0.0.1",/* Log host */ > > > > - {"127.0.0.1" }, /* Name server(s) */ > > > > - {"127.0.0.1" }, /* NTP server(s) */ > > > > - 1, /* sb_efficiency */ > > > > - 0, /* udp_tx_buf_size */ > > > > - 0, /* udp_rx_buf_size */ > > > > - 0, /* tcp_tx_buf_size */ > > > > - 0 /* tcp_rx_buf_size */ > > > > - }; > > > > -#endif > > > > +struct rtems_bsdnet_config rtems_bsdnet_config = { > > > > +NULL, /* Network interface */ > > > > +NULL, /* Use fixed network configuration */ > > > > +0, /* Default network task priority */ > > > > +0, /* Default mbuf capacity */ > > > > +0, /* Default mbuf cluster capacity */ > > > > +"testSystem", /* Host name */ > > > > +"nowhere.com", /* Domain name */ > > > > +"127.0.0.1",/* Gateway */ > > > > +"127.0.0.1",/* Log host */ > > > > +{"127.0.0.1" }, /* Name server(s) */ > > > > +{"127.0.0.1" }, /* NTP server(s) */ > > > > +1, /* sb_efficiency */ > > > > +0, /* udp_tx_buf_size */ > > > > +0, /* udp_rx_buf_size */ > > > > +0, /* tcp_tx_buf_size */ > > > > +0 /* tcp_rx_buf_size */ > > > > +}; > > > > diff --git a/netlegacy.py b/netlegacy.py > > > > index 0889548..0e69076 100644 > > > > --- a/netlegacy.py > > > > +++ b/netlegacy.py > > > > @@ -54,6 +54,12 @@ def build(bld): > > > > for s in os.listdir('./pppd') if s[-2:] == '.c'] > > > > telnetd_source = [os.path.join('./telnetd', s) > > > >for s in os.listdir('telnetd') if s[-2:] == '.c'] > > > > +nfs_source = [] > > > > +for root, dirs, files in os.walk('./nfsclient'): > > > > +for name in files: > > > > +if name[-2:] == '.c': > > can you use os.path.splitext() here? You may like to propagate the > > change elsewhere. > > yes, that would be nice. There are some more places in this file where > this has been used. Should that be a follow-up patch to update this in > all the places? > Yes, that would be acceptable. > Best regards, > Vijay > > > >
Re: [PATCH rtems-net-legacy 1/2] Remove RTEMS_NETWORKING checks
On Tue, Mar 30, 2021 at 10:48 AM Gedare Bloom wrote: > > On Tue, Mar 30, 2021 at 10:40 AM Vijay Kumar Banerjee wrote: > > > > Hi, > > > > > > On Tue, Mar 30, 2021 at 7:53 AM Gedare Bloom wrote: > > > > > > On Mon, Mar 29, 2021 at 7:42 PM Vijay Kumar Banerjee > > > wrote: > > > > > > > > ping :) > > > > > > > > On Tue, Mar 23, 2021 at 2:10 PM Vijay Kumar Banerjee > > > > wrote: > > > > > > > > > > * Remove nfsclient wscript and build from netlegacy.py > > > > > --- > > > > > bsps/powerpc/mpc55xxevb/net/smsc9218i.c | 4 +-- > > > > > libmisc/dummy-networking.c | 44 > > > > > - > > > > > netlegacy.py| 17 +- > > > > > nfsclient/wscript | 1 + > > > > > telnetd/telnetd.c | 4 --- > > > > > wscript | 2 +- > > > > > 6 files changed, 41 insertions(+), 31 deletions(-) > > > > > > > > > > diff --git a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > > > b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > > > index d88aa8a..384f9cd 100644 > > > > > --- a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > > > +++ b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c > > > > > @@ -24,7 +24,7 @@ > > > > > > > > > > #include > > > > > > > > > > -#if defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) > > > > > +#if defined(MPC55XX_HAS_SIU) > > > > > > > > > > #include > > > > > > > > > > @@ -2121,4 +2121,4 @@ int smsc9218i_attach_detach( > > > > >return 0; > > > > > } > > > > > > > > > > -#endif /* defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) */ > > > > > +#endif /* defined(MPC55XX_HAS_SIU) */ > > > > > diff --git a/libmisc/dummy-networking.c b/libmisc/dummy-networking.c > > > > > index 379e23e..b7f15c8 100644 > > > > > --- a/libmisc/dummy-networking.c > > > > > +++ b/libmisc/dummy-networking.c > > > > > @@ -16,27 +16,25 @@ > > > > > #include > > > > > > > > > > /* Loopback Network Configuration */ > > > > > -#if defined(RTEMS_NETWORKING) > > > > > - #include > > > > > - #include > > > > > - #include > > > > > +#include > > > > > +#include > > > > > +#include > > > > > > > > > > - struct rtems_bsdnet_config rtems_bsdnet_config = { > > > > > - NULL, /* Network interface */ > > > > > - NULL, /* Use fixed network configuration */ > > > > > - 0, /* Default network task priority */ > > > > > - 0, /* Default mbuf capacity */ > > > > > - 0, /* Default mbuf cluster capacity */ > > > > > - "testSystem", /* Host name */ > > > > > - "nowhere.com", /* Domain name */ > > > > > - "127.0.0.1",/* Gateway */ > > > > > - "127.0.0.1",/* Log host */ > > > > > - {"127.0.0.1" }, /* Name server(s) */ > > > > > - {"127.0.0.1" }, /* NTP server(s) */ > > > > > - 1, /* sb_efficiency */ > > > > > - 0, /* udp_tx_buf_size */ > > > > > - 0, /* udp_rx_buf_size */ > > > > > - 0, /* tcp_tx_buf_size */ > > > > > - 0 /* tcp_rx_buf_size */ > > > > > - }; > > > > > -#endif > > > > > +struct rtems_bsdnet_config rtems_bsdnet_config = { > > > > > +NULL, /* Network interface */ > > > > > +NULL, /* Use fixed network configuration */ > > > > > +0, /* Default network task priority */ > > > > > +0, /* Default mbuf capacity */ > > > > > +0, /* Default mbuf cluster capacity */ > > > > > +"testSystem", /* Host name */ > > > > > +"nowhere.com", /* Domain name */ > > > > > +"127.0.0.1",/* Gateway */ > > > > > +"127.0.0.1",/* Log host */ > > > > > +{"127.0.0.1" }, /* Name server(s) */ > > > > > +{"127.0.0.1" }, /* NTP server(s) */ > > > > > +1, /* sb_efficiency */ > > > > > +0, /* udp_tx_buf_size */ > > > > > +0, /* udp_rx_buf_size */ > > > > > +0, /* tcp_tx_buf_size */ > > > > > +0 /* tcp_rx_buf_size */ > > > > > +}; > > > > > diff --git a/netlegacy.py b/netlegacy.py > > > > > index 0889548..0e69076 100644 > > > > > --- a/netlegacy.py > > > > > +++ b/netlegacy.py > > > > > @@ -54,6 +54,12 @@ def build(bld): > > > > > for s in os.listdir('./pppd') if s[-2:] == '.c'] > > > > > telnetd_source = [os.path.join('./telnetd', s) > > > > >for s in os.listdir('telnetd') if s[-2:] == > > > > > '.c'] > > > > > +nfs_source = [] > > > > > +for root, dirs, files in os.walk('./nfsclient'): > > > > > +for name in files: > > > > > +if name[-2:] == '.c': > > > can you use os.path.s