Changeset 6fa6367 in rtems

Timestamp:

04/20/01 20:32:08 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

dd74e612

Parents:

a8c33268

Message:

2001-04-20 Radzislaw Galler <rgaller@…>

• 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

Files:

• c/src/exec/libnetworking/ChangeLog (modified) (1 diff)
• c/src/libnetworking/ChangeLog (modified) (1 diff)
• c/src/libnetworking/modem/ppp.c (modified) (2 diffs)
• c/src/libnetworking/pppd/STATUS (modified) (1 diff)
• c/src/libnetworking/pppd/main.c (modified) (6 diffs)
• c/src/libnetworking/pppd/modem_example/modem.c (modified) (7 diffs)
• c/src/libnetworking/pppd/modem_example/ppp.c (modified) (2 diffs)
• c/src/libnetworking/pppd/pppmain.c (modified) (7 diffs)
• c/src/libnetworking/pppd/rtems-ppp.c (modified) (1 diff)
• cpukit/libnetworking/ChangeLog (modified) (1 diff)
• cpukit/pppd/STATUS (modified) (1 diff)

c/src/exec/libnetworking/ChangeLog

@@ +1 @@
+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.

c/src/libnetworking/ChangeLog

@@ +1 @@
+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.

c/src/libnetworking/modem/ppp.c

@@ -76 +76 @@
 #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 */
@@ -217 +217 @@
 #endif
     }
-/* wpisane na twardo do rtems_glue.c
+/* hardcoded in rtems_glue.c
     netisrs[NETISR_PPP] = pppintr; */
         return 1;

c/src/libnetworking/pppd/STATUS

@@ -16 +16 @@
   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.

c/src/libnetworking/pppd/main.c

@@ -322 +322 @@
                 char t[100];
                         stat=LockSTBSystemParam();
-                        sprintf(t,"Dzwoniê pod numer %s ...",stat->Phone_Number);
+                        sprintf(t,"Calling number %s ...",stat->Phone_Number);
                         UnlockSTBSystemParam();         
 #endif
@@ -345 +345 @@
                 {
                 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.");
 
@@ -383 +383 @@
 
                 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;) {
@@ -394 +394 @@
                         if (stat->WantConnection==DontConnect) {
                                 stat->ConnectionStatus = NotConnected;
-                            SetStatusInfo(0, "Roz³¹czam siê ...",0);
+                            SetStatusInfo(0, "Disconnecting...",0);
                                 lcp_close(0, "");
                                 kill_link = 0;
@@ -415 +415 @@
                 clean_check();
                 disestablish_ppp(ttyfd);
-            SetStatusInfo(0, "Po³¹czenie z Internetem zerwane.",1);
+            SetStatusInfo(0, "Broken internet connection.",1);
 
                 /*
@@ -773 +773 @@
                 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;

c/src/libnetworking/pppd/modem_example/modem.c

@@ -715 +715 @@
         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;
@@ -793 +793 @@
   /* 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 */
@@ -811 +811 @@
 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()
@@ -862 +862 @@
                    * 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;
@@ -1227 +1227 @@
                 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);
@@ -1320 +1320 @@
             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();
@@ -1419 +1419 @@
     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;
                 }

c/src/libnetworking/pppd/modem_example/ppp.c

@@ -76 +76 @@
 #include "ppp.h"
 #if NPPP > 0
-/* na razie wylaczmy kompresje*/
+/* temporarily we switch off the compression */
 
 #include <sys/param.h>
@@ -211 +211 @@
 #endif
     }
-/* wpisane na twardo do rtems_glue.c
+/* hardcoded in rtems_glue.c
     netisrs[NETISR_PPP] = pppintr; */
         return 1;

c/src/libnetworking/pppd/pppmain.c

@@ -337 +337 @@
                 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);
@@ -363 +363 @@
 #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
@@ -370 +370 @@
                 {
 #if 0
-                            SetStatusInfo(0, "£¹czenie z Internetem...",0);
+                            SetStatusInfo(0, "Connecting the Internet...",0);
 #endif
                 }
@@ -407 +407 @@
                 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;) {
@@ -420 +420 @@
                         if (stat->WantConnection==DontConnect) {
                                 stat->ConnectionStatus = NotConnected;
-                            SetStatusInfo(0, "Roz³¹czam siê ...",0);
+                            SetStatusInfo(0, "Disconnecting ...",0);
                                 lcp_close(0, "");
                                 kill_link = 0;
@@ -442 +442 @@
                 disestablish_ppp(ttyfd);
 #if 0
-            SetStatusInfo(0, "Po³¹czenie z Internetem zerwane.",1);
+            SetStatusInfo(0, "Broken the internet connection.",1);
 #endif
                 /*
@@ -800 +800 @@
                 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;

c/src/libnetworking/pppd/rtems-ppp.c

@@ -428 +428 @@
     }
 /*    baud_rate = 9600;*/
-/* na razie wpisujemy na twardo*/
-
+/* we hardcode it temporarily */
     if (tcsetattr(fd, TCSANOW, &tios) < 0) {
         syslog(LOG_ERR, "tcsetattr: %m");

cpukit/libnetworking/ChangeLog

@@ +1 @@
+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.

cpukit/pppd/STATUS

@@ -16 +16 @@
   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.