Diff: TestShell.cpp

Revision:

1:9d655061fa1e

Parent:

0:606b230e5b4a

--- a/TestShell.cpp	Sat Apr 10 00:30:24 2010 +0000
+++ b/TestShell.cpp	Tue Oct 30 11:42:47 2012 +0000
@@ -108,7 +108,7 @@
         {
             if (t->_devClass == WII_REMOTE && data[1] == 0x30)
             {
-                printf("================wii====================\n");
+                printf("================wii====================\r\n");
                 t->Led();
                 t->Hid();   // ask for accelerometer
                 t->_devClass = 0;
@@ -121,7 +121,7 @@
                 {
                     int x = (signed char)d[3];
                     int y = (signed char)d[4];
-                    printf("Mouse %2X dx:%d dy:%d\n",d[2],x,y);
+                    printf("Mouse %2X dx:%d dy:%d\r\n",d[2],x,y);
                 }
                 break;
 
@@ -131,7 +131,7 @@
                     int x = (d[2] & 0x60) >> 5 | d[4] << 2;
                     int y = (d[3] & 0x20) >> 4 | d[5] << 2;
                     int z = (d[3] & 0x40) >> 5 | d[6] << 2;
-                    printf("WII %04X %d %d %d\n",pad,x,y,z);
+                    printf("WII %04X %d %d %d\r\n",pad,x,y,z);
                 }
                 break;
                 default:
@@ -142,19 +142,19 @@
 
     static void OnHidControl(int socket, SocketState state, const u8* data, int len, void* userData)
     {
-        printf("OnHidControl\n");
+        printf("OnHidControl\r\n");
         if (data)
             printHex(data,len);
     }
 
     void Open(BD_ADDR* bdAddr, inquiry_info* info)
     {
-        printf("L2CAPAddr size %d\n",sizeof(L2CAPAddr));
+        printf("L2CAPAddr size %d\r\n",sizeof(L2CAPAddr));
         _addr = *bdAddr;
         L2CAPAddr sockAddr;
         sockAddr.bdaddr = _addr;
         sockAddr.psm = L2CAP_PSM_HID_INTR;
-                printf("Socket_Open size %d\n",sizeof(L2CAPAddr));
+                printf("Socket_Open size %d\r\n",sizeof(L2CAPAddr));
         _interrupt = Socket_Open(SOCKET_L2CAP,&sockAddr.hdr,OnHidInterrupt,this);
         sockAddr.psm = L2CAP_PSM_HID_CNTL;
         _control = Socket_Open(SOCKET_L2CAP,&sockAddr.hdr,OnHidControl,this);
@@ -201,7 +201,7 @@
 public:
     void Ready()
     {
-    printf("HIDBluetooth %d\n",sizeof(HIDBluetooth));
+    printf("HIDBluetooth %d\r\n",sizeof(HIDBluetooth));
          memset(_hids,0,sizeof(_hids));
         Inquiry();
 
@@ -215,7 +215,7 @@
         printf(a);
         BTDevice* bt = hci->Find(a);
         HIDBluetooth* hid = NewHIDBluetooth();
-        printf("%08x %08x\n",bt,hid);
+        printf("%08x %08x\r\n",bt,hid);
         if (hid)
             hid->Open(a,&bt->_info);
     }
@@ -240,7 +240,7 @@
                 BD_ADDR* bd = &devs[i]->_info.bdaddr;
                 printf("Connecting to ");
                 printf(bd);
-                printf("\n");
+                printf("\r\n");
                 gHCI->CreateConnection(bd);
             }
         }
@@ -255,7 +255,7 @@
             int c = GetConsoleChar();
             if (c == -1)
                 continue;
-            if (c == '\n' || c == 13)
+            if (c == '\r\n' || c == 13)
                 break;
             _line[i++] = c;
         }
@@ -265,18 +265,18 @@
 
     void Inquiry()
     {
-        printf("Inquiry..\n");
+        printf("Inquiry..\r\n");
         gHCI->Inquiry();
     }
 
     void List()
     {
         #if 0
-        printf("%d devices\n",_deviceCount);
+        printf("%d devices\r\n",_deviceCount);
         for (int i = 0; i < _deviceCount; i++)
         {
             printf(&_devices[i].info.bdaddr);
-            printf("\n");
+            printf("\r\n");
         }
         #endif
     }
@@ -318,7 +318,7 @@
                 Quit();
                 break;
             } else {
-                printf("eh? %s\n",cmd);
+                printf("eh? %s\r\n",cmd);
             }
         }
     }
@@ -332,18 +332,18 @@
     switch (evt)
     {
         case CALLBACK_READY:
-            printf("CALLBACK_READY\n");
+            printf("CALLBACK_READY\r\n");
             gApp.Ready();
             break;
 
         case CALLBACK_INQUIRY_RESULT:
             printf("CALLBACK_INQUIRY_RESULT ");
             printf((BD_ADDR*)data);
-            printf("\n");
+            printf("\r\n");
             break;
 
         case CALLBACK_INQUIRY_DONE:
-            printf("CALLBACK_INQUIRY_DONE\n");
+            printf("CALLBACK_INQUIRY_DONE\r\n");
             gApp.ConnectDevices();
             break;
 
@@ -352,7 +352,7 @@
                 BD_ADDR* addr = (BD_ADDR*)data;
                 const char* name = (const char*)(data + 6);
                 printf(addr);
-                printf(" % s\n",name);
+                printf(" % s\r\n",name);
             }
             break;
 
@@ -376,7 +376,7 @@
 u8* USBGetBuffer(u32* len);
 int OnBluetoothInsert(int device)
 {
-    printf("Bluetooth inserted of %d\n",device);
+    printf("Bluetooth inserted of %d\r\n",device);
     u32 sramLen;
     u8* sram =  USBGetBuffer(&sramLen);
     sram = (u8*)(((u32)sram + 1023) & ~1023);