common: Fix two -Wold-style-declaration warnings.

[gps-watch.git] / src / common / virtual_com.c

diff --git a/src/common/virtual_com.c b/src/common/virtual_com.c
index aa25cd78590424c7d567414888c855fd3aa9d2c4..2427f9369564239c6fc83dbb0b0ebb30faba46ff 100644 (file)
--- a/src/common/virtual_com.c
+++ b/src/common/virtual_com.c
@@ -102,9 +102,8 @@ static usb_cdc_acm_info_t s_usbCdcAcmInfo = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0,
 
 /* Data buffer for receiving and sending*/
 static uint8_t s_currRecvBuf[DATA_BUFF_SIZE];
-volatile static uint32_t s_recvSize = 0;
-volatile static uint32_t s_sendSize = 0;
-volatile static uint8_t s_sendComplete = 0;
+static volatile uint32_t s_recvSize = 0;
+static volatile uint8_t s_sendComplete = 0;
 static uint32_t s_usbBulkMaxPacketSize = FS_CDC_VCOM_BULK_OUT_PACKET_SIZE;
 /*******************************************************************************
 * Prototypes
@@ -660,10 +659,14 @@ USB_VcomInit (uint16_t vid, uint16_t pid)
 }
 
 /* See virtual_com.h for documentation of this function. */
-void USB_VcomDeinit(usb_device_handle deviceHandle)
+void
+USB_VcomDeinit (void)
 {
-    USB_DeviceStop(deviceHandle);
-    USB_DeviceDeinit(deviceHandle);
+       if (s_cdcVcom.deviceHandle == NULL)
+               return;
+
+    USB_DeviceStop (s_cdcVcom.deviceHandle);
+    USB_DeviceDeinit (s_cdcVcom.deviceHandle);
     s_cdcVcom.deviceHandle = NULL;
 
        /* XXX: We are not stopping the USBOTG clock yet. */