主采集逻辑修改中，添加了部分写文件实现

source/OSIF/include/common/buses/rs232/RS232DeviceLocator.h

@@ -0,0 +1,65 @@
+/***************************************************//**
+ * @file    RS232DeviceLocator.h
+ * @date    February 2012
+ * @author  Ocean Optics, Inc.
+ *
+ * This class encapsulates the information needed to open
+ * a device on an RS232 bus.
+ *
+ * LICENSE:
+ *
+ * SeaBreeze Copyright (C) 2014, Ocean Optics Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************/
+
+#ifndef RS232DEVICELOCATOR_H
+#define RS232DEVICELOCATOR_H
+
+#include "common/buses/DeviceLocatorInterface.h"
+#include <string>
+
+namespace seabreeze {
+
+    class RS232DeviceLocator : public DeviceLocatorInterface {
+    public:
+        RS232DeviceLocator(std::string devicePath, int baudRate);
+        virtual ~RS232DeviceLocator();
+
+        std::string &getDevicePath();
+        int getBaudRate();
+
+        /* Inherited from DeviceLocatorInterface */
+        virtual unsigned long getUniqueLocation() const;
+        virtual bool equals(DeviceLocatorInterface &that);
+        virtual std::string getDescription();
+        virtual BusFamily getBusFamily() const;
+        virtual DeviceLocatorInterface *clone() const;
+
+    private:
+        void computeLocationHash();
+        std::string devicePath;
+        int baudRate;
+        unsigned long locationHash;
+    };
+
+}
+
+#endif /* RS232DEVICELOCATOR_H */

source/OSIF/include/common/buses/rs232/RS232Interface.h

@@ -0,0 +1,63 @@
+/***************************************************//**
+ * @file    RS232Interface.h
+ * @date    April 2011
+ * @author  Ocean Optics, Inc.
+ *
+ * LICENSE:
+ *
+ * SeaBreeze Copyright (C) 2014, Ocean Optics Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************/
+
+#ifndef RS232INTERFACE_H
+#define RS232INTERFACE_H
+
+#include "common/buses/Bus.h"
+#include "native/rs232/NativeRS232.h"
+#include "native/rs232/RS232.h"
+#include "common/exceptions/IllegalArgumentException.h"
+
+namespace seabreeze {
+
+    class RS232Interface : public Bus {
+    public:
+        RS232Interface();
+        virtual ~RS232Interface();
+        virtual RS232 *getRS232Descriptor();
+        virtual DeviceLocatorInterface *getLocation();
+        virtual void setLocation(const DeviceLocatorInterface &location)
+                throw (IllegalArgumentException);
+        virtual BusFamily getBusFamily() const;
+        
+        /* Pure virtual methods */
+        virtual TransferHelper *getHelper(
+                const std::vector<ProtocolHint *> &hints) const = 0;
+        virtual bool open() = 0;
+        virtual void close() = 0;
+
+    protected:
+        RS232 *rs232;
+        DeviceLocatorInterface *deviceLocator;
+    };
+
+}
+
+#endif /* RS232INTERFACE_H */

source/OSIF/include/common/buses/rs232/RS232TransferHelper.h

@@ -0,0 +1,65 @@
+/***************************************************//**
+ * @file    RS232TransferHelper.h
+ * @date    April 2011
+ * @author  Ocean Optics, Inc.
+ *
+ * This provides an abstraction around the RS232 bus.
+ * RS232 is pretty simple once the port is opened and
+ * configured, so this mostly just takes care of ensuring
+ * that all bytes are sent and received as required.
+ *
+ * This will effectively block on reads and writes until
+ * they are complete.  A non-blocking transfer helper
+ * could be created to complement this if there was
+ * some need, but it is not clear who would be responsible
+ * for delayed reads or retransmits.
+ *
+ * LICENSE:
+ *
+ * SeaBreeze Copyright (C) 2014, Ocean Optics Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************/
+
+#ifndef RS232TRANSFERHELPER_H
+#define RS232TRANSFERHELPER_H
+
+#include "common/buses/TransferHelper.h"
+#include "native/rs232/RS232.h"
+
+namespace seabreeze {
+
+    class RS232TransferHelper : public TransferHelper {
+    public:
+        RS232TransferHelper(RS232 *rs232Descriptor);
+        virtual ~RS232TransferHelper();
+
+        virtual int receive(std::vector<byte> &buffer, unsigned int length)
+            throw (BusTransferException);
+        virtual int send(const std::vector<byte> &buffer, unsigned int length) const
+            throw (BusTransferException);
+
+    protected:
+        RS232 *rs232;
+    };
+
+}
+
+#endif /* USBTRANSFERHELPER_H */