summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-04-20 20:32:08 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-04-20 20:32:08 +0000
commit6fa636725c3d9f3b9fa03f0dccadc8f448466ad6 (patch)
tree1fff59e66af6289a2cb367793fcd1b40bc329653
parenta8c3326863d5c422f8d9094ef5df5ca285213bb1 (diff)
downloadrtems-6fa636725c3d9f3b9fa03f0dccadc8f448466ad6.tar.bz2
2001-04-20 Radzislaw Galler <rgaller@et.put.poznan.pl>
* modem/ppp.c, pppd/main.c, pppd/pppmain.c, pppd/rtems-ppp.c, pppd/modem_example/modem.c, pppd/modem_example/ppp.c: Translated Polish comments and other strings into English * pppd/STATUS: Updated to reflect the changes
-rw-r--r--c/src/exec/libnetworking/ChangeLog9
-rw-r--r--c/src/libnetworking/ChangeLog9
-rw-r--r--c/src/libnetworking/modem/ppp.c4
-rw-r--r--c/src/libnetworking/pppd/STATUS4
-rw-r--r--c/src/libnetworking/pppd/main.c14
-rw-r--r--c/src/libnetworking/pppd/modem_example/modem.c32
-rw-r--r--c/src/libnetworking/pppd/modem_example/ppp.c4
-rw-r--r--c/src/libnetworking/pppd/pppmain.c14
-rw-r--r--c/src/libnetworking/pppd/rtems-ppp.c3
-rw-r--r--cpukit/libnetworking/ChangeLog9
-rw-r--r--cpukit/pppd/STATUS4
11 files changed, 65 insertions, 41 deletions
diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog
index 27dcf53f68..cfb3f3394c 100644
--- a/c/src/exec/libnetworking/ChangeLog
+++ b/c/src/exec/libnetworking/ChangeLog
@@ -1,8 +1,15 @@
+2001-04-20 Radzislaw Galler <rgaller@et.put.poznan.pl>
+
+ * modem/ppp.c, pppd/main.c, pppd/pppmain.c, pppd/rtems-ppp.c,
+ pppd/modem_example/modem.c, pppd/modem_example/ppp.c: Translated
+ Polish comments and other strings into English
+ * pppd/STATUS: updated to reflect the changes
+
2001-04-20 Jake Janovetz <janovetz@uiuc.edu>
* rtems_servers/ftpd.c: Correct argument so hooks work again.
-2001-03-15 Ralf Corsepiu <corsepius@faw.uni-ulm.de>
+2001-03-15 Ralf Corsepius <corsepius@faw.uni-ulm.de>
* include/.cvsignore: Remove danlgling file.
diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog
index 27dcf53f68..cfb3f3394c 100644
--- a/c/src/libnetworking/ChangeLog
+++ b/c/src/libnetworking/ChangeLog
@@ -1,8 +1,15 @@
+2001-04-20 Radzislaw Galler <rgaller@et.put.poznan.pl>
+
+ * modem/ppp.c, pppd/main.c, pppd/pppmain.c, pppd/rtems-ppp.c,
+ pppd/modem_example/modem.c, pppd/modem_example/ppp.c: Translated
+ Polish comments and other strings into English
+ * pppd/STATUS: updated to reflect the changes
+
2001-04-20 Jake Janovetz <janovetz@uiuc.edu>
* rtems_servers/ftpd.c: Correct argument so hooks work again.
-2001-03-15 Ralf Corsepiu <corsepius@faw.uni-ulm.de>
+2001-03-15 Ralf Corsepius <corsepius@faw.uni-ulm.de>
* include/.cvsignore: Remove danlgling file.
diff --git a/c/src/libnetworking/modem/ppp.c b/c/src/libnetworking/modem/ppp.c
index 589089822d..4ccecc85c1 100644
--- a/c/src/libnetworking/modem/ppp.c
+++ b/c/src/libnetworking/modem/ppp.c
@@ -75,7 +75,7 @@
#include "ppp.h"
#if NPPP > 0
-/* na razie wylaczmy kompresje*/
+/* temporarily we switch off the compression */
#include <rtems/rtems_bsdnet.h> /* to get right defines */
@@ -216,7 +216,7 @@ int rtems_ppp_driver_attach (struct rtems_bsdnet_ifconfig *config,
bpfattach(&sc->sc_bpf, &sc->sc_if, DLT_PPP, PPP_HDRLEN);
#endif
}
-/* wpisane na twardo do rtems_glue.c
+/* hardcoded in rtems_glue.c
netisrs[NETISR_PPP] = pppintr; */
return 1;
}
diff --git a/c/src/libnetworking/pppd/STATUS b/c/src/libnetworking/pppd/STATUS
index 95ef16cefc..0e4980cbbc 100644
--- a/c/src/libnetworking/pppd/STATUS
+++ b/c/src/libnetworking/pppd/STATUS
@@ -15,7 +15,9 @@ easily configurable.
specific manner. main.c is particularly guilty of this although
other files suffer from this also.
-+ Find comments in Polish and get Tomasz to translate them. :)
++ Find comments in Polish and get Tomasz to translate them. :)
+ (DONE but not sure if completely
+ Radzislaw Galler <rgaller@et.put.poznan.pl>)
+ Add netdemo showing configuration and initialization.
diff --git a/c/src/libnetworking/pppd/main.c b/c/src/libnetworking/pppd/main.c
index cfe3d14f30..2b4501bfcc 100644
--- a/c/src/libnetworking/pppd/main.c
+++ b/c/src/libnetworking/pppd/main.c
@@ -321,7 +321,7 @@ char *argv[];
/* XXX PPPConfiguration */
char t[100];
stat=LockSTBSystemParam();
- sprintf(t,"Dzwonię pod numer %s ...",stat->Phone_Number);
+ sprintf(t,"Calling number %s ...",stat->Phone_Number);
UnlockSTBSystemParam();
#endif
SetStatusInfo(0, t,0);
@@ -344,11 +344,11 @@ char *argv[];
if (i<0)
{
char t[100];
- sprintf(t,"Łączenie z Internetem z prędkoscią %d baud...",-i);
+ sprintf(t,"Connecting the Internet at %d baud...",-i);
SetStatusInfo(0, t,0);
}
else
- SetStatusInfo(0, "Łączenie z Internetem...",0);
+ SetStatusInfo(0, "Connecting the Internet...",0);
syslog(LOG_INFO, "Serial connection established.");
sleep(1); /* give it time to set up its terminal */
@@ -382,7 +382,7 @@ char *argv[];
lcp_open(0); /* Start protocol */
rtems_bsdnet_semaphore_release();
- SetStatusInfo(0, "Połączenie z Internetem nawiązane.",1);
+ SetStatusInfo(0, "Internet connection established.",1);
for (phase = PHASE_ESTABLISH; phase != PHASE_DEAD;) {
wait_input(timeleft(&timo));
@@ -393,7 +393,7 @@ char *argv[];
stat=LockSTBSystemParam();
if (stat->WantConnection==DontConnect) {
stat->ConnectionStatus = NotConnected;
- SetStatusInfo(0, "Rozłączam się ...",0);
+ SetStatusInfo(0, "Disconnecting...",0);
lcp_close(0, "");
kill_link = 0;
}
@@ -414,7 +414,7 @@ char *argv[];
*/
clean_check();
disestablish_ppp(ttyfd);
- SetStatusInfo(0, "Połączenie z Internetem zerwane.",1);
+ SetStatusInfo(0, "Broken internet connection.",1);
/*
* Run disconnector script, if requested.
@@ -772,7 +772,7 @@ int connect_script(int fd)
else
stat->provider=DumbLogin;
switch (stat->provider) {
- case Poland_TPSA:
+ case Poland_TPSA: /* TPSA - Polish Telecom */
sprintf(program, scripts[1], stat->Phone_Number, stat->PPP_User, stat->PPP_Password);
break;
default:
diff --git a/c/src/libnetworking/pppd/modem_example/modem.c b/c/src/libnetworking/pppd/modem_example/modem.c
index 7d07a71c40..119421e476 100644
--- a/c/src/libnetworking/pppd/modem_example/modem.c
+++ b/c/src/libnetworking/pppd/modem_example/modem.c
@@ -714,15 +714,15 @@ modem_txDaemon (void *arg)
register int level,i,maxonce;
while (1)
{
- if (xmt_len==0) //jezeli nic nie ma to czekajmy na event
+ if (xmt_len==0) //if there is nothing then wait for an event
rtems_event_receive(START_TRANSMIT_EVENT|INTERRUPT_EVENT,RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT,&events);
/* wait for transmit buffer to become empty */
- while(_tx_stop) //tu czekamy na start transmisji
+ while(_tx_stop) //here we are wainting for transmission start
rtems_event_receive(INTERRUPT_EVENT|START_TRANSMIT_EVENT,RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT,&events);
_CPU_ISR_Disable(level);
- if (*LSR & THRE) //jezeli nie ma transmisji to wyslijmy pierwsze bajty, jezeli jest, same pojda
+ if (*LSR & THRE) //if there is no transmission then send first bytes, if there is one they will go eitherway
{
maxonce=(xmt_len>14)?14:xmt_len;
if (maxonce>0)
@@ -792,8 +792,8 @@ modem_init (int speed) /* port is the SMC number (i.e. 1 or 2) */
set_modem_speed(speed);
/* Line control setup */
- *LCR = (char)(WL_8 ); /* 8 bitowe slowo */
- /* bylo NSB - bylo 2 jest 1*/
+ *LCR = (char)(WL_8 ); /* 8 bit word */
+ /* was NSB - was 2 is 1*/
/* Interrupt setup */
*IER = (char) 0x0f; /* enable transmit, receive, modem stat int */
@@ -810,9 +810,9 @@ modem_init (int speed) /* port is the SMC number (i.e. 1 or 2) */
void set_modem_dtr(int how)
{
- unsigned char znak;
- znak=*MCR;
- *MCR=(how)?(znak|DTR):(znak&(~DTR));
+ unsigned char ch;
+ ch=*MCR;
+ *MCR=(how)?(ch|DTR):(ch&(~DTR));
}
void modem_status()
{
@@ -861,7 +861,7 @@ modemInterruptHandler (rtems_vector_number v)
/*
* Buffer transmitted ?
*/
- if (*LSR & THRE) //jezeli nie ma transmisji (a nie powinno byc) to wyslijmy bajty
+ if (*LSR & THRE) //if there is no transmission (and it shouldn't be) then send some bytes
{
maxonce=(xmt_len>14)?14:xmt_len;
if (maxonce>0)
@@ -1226,10 +1226,10 @@ rtems_device_driver modem_read(
for (;;) {
if (sc->sc_inq.ifq_head != NULL)
{
-/* printf("Read : Dane sa w buforze\n");
+/* printf("Read : Data are in the buffer\n");
*/ break;
}
-/* printf("Read : Czekam na dane\n");
+/* printf("Read : Waiting for data\n");
*/
status=rtems_semaphore_obtain(ModemData.pppsem,RTEMS_WAIT,ticks);
if (_modem_cd==0)
@@ -1319,7 +1319,7 @@ rtems_device_driver modem_write(
m0->m_data += PPP_HDRLEN;
m0->m_len -= PPP_HDRLEN;
-/* printf("Wysylam %d bajtow \n",m0->m_len);
+/* printf("Sending %d bytes \n",m0->m_len);
*/ n=pppoutput(&sc->sc_if, m0, &dst, (struct rtentry *)0);
rtems_bsdnet_semaphore_release();
return n;
@@ -1418,19 +1418,19 @@ wait_input(timo)
rtems_event_set events;
rtems_interval ticks;
rtems_status_code err;
- int czekaj=1;
+ int num_wait=1;
register struct ppp_softc *sc = (struct ppp_softc *)ModemData.t_sc;
ticks = 1+(timo->tv_sec*1000000+timo->tv_usec)/rtems_bsdnet_microseconds_per_tick;
- while (czekaj)
+ while (num_wait)
{
if (sc->sc_inq.ifq_head != NULL)
break;
-/* printf("Wait : Czekam na dane przez %d ticks\n",ticks);
+/* printf("Wait : Waiting for data for %d ticks\n",ticks);
*/ err=rtems_semaphore_obtain(ModemData.pppsem,RTEMS_WAIT,ticks);
if (err==RTEMS_TIMEOUT)
{
-/* printf("TIMEOUT :Brak danych\n");
+/* printf("TIMEOUT : No data\n");
*/ break;
}
}
diff --git a/c/src/libnetworking/pppd/modem_example/ppp.c b/c/src/libnetworking/pppd/modem_example/ppp.c
index 1489144559..22c53302fe 100644
--- a/c/src/libnetworking/pppd/modem_example/ppp.c
+++ b/c/src/libnetworking/pppd/modem_example/ppp.c
@@ -75,7 +75,7 @@
#include "ppp.h"
#if NPPP > 0
-/* na razie wylaczmy kompresje*/
+/* temporarily we switch off the compression */
#include <sys/param.h>
#include <sys/systm.h>
@@ -210,7 +210,7 @@ int rtems_ppp_driver_attach (struct rtems_bsdnet_ifconfig *config)
bpfattach(&sc->sc_bpf, &sc->sc_if, DLT_PPP, PPP_HDRLEN);
#endif
}
-/* wpisane na twardo do rtems_glue.c
+/* hardcoded in rtems_glue.c
netisrs[NETISR_PPP] = pppintr; */
return 1;
}
diff --git a/c/src/libnetworking/pppd/pppmain.c b/c/src/libnetworking/pppd/pppmain.c
index 0bf8d68e87..4ba37a945f 100644
--- a/c/src/libnetworking/pppd/pppmain.c
+++ b/c/src/libnetworking/pppd/pppmain.c
@@ -336,7 +336,7 @@ char *argv[];
/* XXX PPPConfiguration */
char t[100];
stat=LockSTBSystemParam();
- sprintf(t,"Dzwonię pod numer %s ...",stat->Phone_Number);
+ sprintf(t,"Calling the number %s ...",stat->Phone_Number);
UnlockSTBSystemParam();
SetStatusInfo(0, t,0);
#endif
@@ -362,14 +362,14 @@ char *argv[];
{
#if 0
char t[100];
- sprintf(t,"Łączenie z Internetem z prędkoscią %d baud...",-i);
+ sprintf(t,"Connecting the Internet at %d baud...",-i);
SetStatusInfo(0, t,0);
#endif
}
else
{
#if 0
- SetStatusInfo(0, "Łączenie z Internetem...",0);
+ SetStatusInfo(0, "Connecting the Internet...",0);
#endif
}
syslog(LOG_INFO, "Serial connection established.");
@@ -406,7 +406,7 @@ char *argv[];
rtems_bsdnet_semaphore_release();
#if 0
- SetStatusInfo(0, "Połączenie z Internetem nawiązane.",1);
+ SetStatusInfo(0, "Internet connection established.",1);
#endif
for (phase = PHASE_ESTABLISH; phase != PHASE_DEAD;) {
#if 0
@@ -419,7 +419,7 @@ char *argv[];
stat=LockSTBSystemParam();
if (stat->WantConnection==DontConnect) {
stat->ConnectionStatus = NotConnected;
- SetStatusInfo(0, "Rozłączam się ...",0);
+ SetStatusInfo(0, "Disconnecting ...",0);
lcp_close(0, "");
kill_link = 0;
}
@@ -441,7 +441,7 @@ char *argv[];
clean_check();
disestablish_ppp(ttyfd);
#if 0
- SetStatusInfo(0, "Połączenie z Internetem zerwane.",1);
+ SetStatusInfo(0, "Broken the internet connection.",1);
#endif
/*
* Run disconnector script, if requested.
@@ -799,7 +799,7 @@ int connect_script(int fd)
else
stat->provider=DumbLogin;
switch (stat->provider) {
- case Poland_TPSA:
+ case Poland_TPSA: /* TPSA - Polish Telecom */
sprintf(program, scripts[1], stat->Phone_Number, stat->PPP_User, stat->PPP_Password);
break;
default:
diff --git a/c/src/libnetworking/pppd/rtems-ppp.c b/c/src/libnetworking/pppd/rtems-ppp.c
index d54825c9ef..12ca0eb9fb 100644
--- a/c/src/libnetworking/pppd/rtems-ppp.c
+++ b/c/src/libnetworking/pppd/rtems-ppp.c
@@ -427,8 +427,7 @@ set_up_tty(fd, local)
}
}
/* baud_rate = 9600;*/
-/* na razie wpisujemy na twardo*/
-
+/* we hardcode it temporarily */
if (tcsetattr(fd, TCSANOW, &tios) < 0) {
syslog(LOG_ERR, "tcsetattr: %m");
die(1);
diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog
index 27dcf53f68..cfb3f3394c 100644
--- a/cpukit/libnetworking/ChangeLog
+++ b/cpukit/libnetworking/ChangeLog
@@ -1,8 +1,15 @@
+2001-04-20 Radzislaw Galler <rgaller@et.put.poznan.pl>
+
+ * modem/ppp.c, pppd/main.c, pppd/pppmain.c, pppd/rtems-ppp.c,
+ pppd/modem_example/modem.c, pppd/modem_example/ppp.c: Translated
+ Polish comments and other strings into English
+ * pppd/STATUS: updated to reflect the changes
+
2001-04-20 Jake Janovetz <janovetz@uiuc.edu>
* rtems_servers/ftpd.c: Correct argument so hooks work again.
-2001-03-15 Ralf Corsepiu <corsepius@faw.uni-ulm.de>
+2001-03-15 Ralf Corsepius <corsepius@faw.uni-ulm.de>
* include/.cvsignore: Remove danlgling file.
diff --git a/cpukit/pppd/STATUS b/cpukit/pppd/STATUS
index 95ef16cefc..0e4980cbbc 100644
--- a/cpukit/pppd/STATUS
+++ b/cpukit/pppd/STATUS
@@ -15,7 +15,9 @@ easily configurable.
specific manner. main.c is particularly guilty of this although
other files suffer from this also.
-+ Find comments in Polish and get Tomasz to translate them. :)
++ Find comments in Polish and get Tomasz to translate them. :)
+ (DONE but not sure if completely
+ Radzislaw Galler <rgaller@et.put.poznan.pl>)
+ Add netdemo showing configuration and initialization.