X-Git-Url: https://oss.titaniummirror.com/gitweb?p=cp210x.git;a=blobdiff_plain;f=src%2Fexamples%2Fcpmfg.c;h=f4c54014aaff214b11b5e1f9714e46c39ff08ab9;hp=a8a94d87d5a77f488822f915593aad643be5487f;hb=adcc360e576188af96b2dd22be2bed75e151d769;hpb=e491c3e2ddc2dd42120f2c981d3c1985118a0f6b

diff --git a/src/examples/cpmfg.c b/src/examples/cpmfg.c
index a8a94d8..f4c5401 100644
--- a/src/examples/cpmfg.c
+++ b/src/examples/cpmfg.c
@@ -5,68 +5,22 @@
  * device.
  */
 
+#include <fcntl.h>
 #include <netinet/in.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <unistd.h>
+#include "../cp210x.h"
 
 #define VID	0x10c4
 #define PID	0xea60
 
-/* CP2103 ioctls */
-#define IOCTL_GPIOGET		0x8000	/* Get gpio bits */
-#define IOCTL_GPIOSET		0x8001	/* Set gpio bits */
-#define IOCTL_GPIOBIC		0x8002	/* Clear specific gpio bit(s) */
-#define IOCTL_GPIOBIS		0x8003	/* Set specific gpio bit(s) */
-
-/* CP210x ioctls principally used during initial device configuration */
-#define IOCTL_DEVICERESET	0x8004	/* Reset the cp210x */
-#define IOCTL_PORTCONFGET	0x8005	/* Get port configuration */
-#define IOCTL_PORTCONFSET	0x8006	/* Set port configuration */
-#define IOCTL_SETVID		0x8007	/* Set vendor id */
-#define IOCTL_SETPID		0x8008	/* Set product id */
-#define IOCTL_SETMFG		0x8009	/* Set manufacturer string */
-#define IOCTL_SETPRODUCT	0x800a	/* Set product string */
-#define IOCTL_SETSERIAL		0x800b	/* Set serial number string */
-#define IOCTL_SETDEVVER		0x800c	/* set device version id */
-/* FIXME: where is IOCTL_SETMFG? */
-
-/* CP2103 GPIO */
-#define GPIO_0		0x01
-#define GPIO_1		0x02
-#define GPIO_2		0x04
-#define GPIO_3		0x08
-#define GPIO_MASK	(GPIO_0|GPIO_1|GPIO_2|GPIO_3)
-
-/* Port config definitions */
-typedef struct {
-    uint16_t mode;		/* Push-pull = 1, Open-drain = 0 */
-    uint16_t lowPower;
-    uint16_t latch;		/* Logic high = 1, Logic low = 0 */
-} cp2101_port_state_t;
-
-typedef struct {
-    cp2101_port_state_t reset;
-    cp2101_port_state_t suspend;
-    uint8_t enhancedFxn;
-} cp2101_port_config_t;
-
-#define PORT_CONFIG_LEN	13	/* Because sizeof() will pad to full words */
-
-/* Used to pass variable sized buffers between user and kernel space (ioctls) */
-typedef struct {
-	char* buf;
-	size_t len;
-} cp210x_buffer_t;
-
-void exit(int);
-
 int cpConnect(char* device)
 {
-    int ret, ioval;
     int fd = open(device, O_RDWR);
     if (fd < 0) {
 	fprintf(stderr, "cannot open %s\n", device);
@@ -85,7 +39,7 @@ void cpDisconnect(int fd)
 void cpSetStr(int fd, unsigned int ioctlno, char* string, size_t len)
 {
     int ret;
-    cp210x_buffer_t buf = { buf: string, len: len };
+    struct cp210x_buffer buf = { buf: (unsigned char *)string, len: len };
 
     ret = ioctl(fd, ioctlno, &buf);
     if (ret) {
@@ -98,10 +52,10 @@ void cpSetStr(int fd, unsigned int ioctlno, char* string, size_t len)
 void cpSetPortConf(int fd, int nopullups)
 {
     int ret;
-    cp2101_port_config_t config;
+    struct cp210x_port_config config;
 
     /* Read the current port configuration */
-    if ((ret = ioctl(fd, IOCTL_PORTCONFGET, &config))) {
+    if ((ret = ioctl(fd, CP210x_IOCTL_PORTCONFGET, &config))) {
 	fprintf(stderr, "portconfget ioctl failed %d\n", ret);
 	exit(1);
     }
@@ -122,7 +76,7 @@ void cpSetPortConf(int fd, int nopullups)
     if (nopullups)
 	config.enhancedFxn &= ~0x10;
 
-    if ((ret = ioctl(fd, IOCTL_PORTCONFSET, &config))) {
+    if ((ret = ioctl(fd, CP210x_IOCTL_PORTCONFSET, &config))) {
 	fprintf(stderr, "portconfset ioctl failed %d\n", ret);
 	exit(1);
     }
@@ -133,7 +87,7 @@ void cpReset(int fd)
     int ret;
 
     /* Reset the part */
-    if ((ret = ioctl(fd, IOCTL_DEVICERESET, 0))) {
+    if ((ret = ioctl(fd, CP210x_IOCTL_DEVICERESET, 0))) {
 	fprintf(stderr, "device reset ioctl %d\n", ret);
 	exit(1);
     }
@@ -175,10 +129,10 @@ int main(int argc, char* argv[])
     strcpy(newsn, argv[nopullups + 4]);
     fd = cpConnect(argv[nopullups + 1]);
     /* SiLabs doesn't allow set of mfg string on cp210x.
-     * cpSetStr(fd, IOCTL_SETMFG, newmfg, strlen(newmfg));
+     * cpSetStr(fd, CP210x_IOCTL_SETMFG, newmfg, strlen(newmfg));
      */
-    cpSetStr(fd, IOCTL_SETPRODUCT, newprod, strlen(newprod));
-    cpSetStr(fd, IOCTL_SETSERIAL, newsn, strlen(newsn));
+    cpSetStr(fd, CP210x_IOCTL_SETPRODUCT, newprod, strlen(newprod));
+    cpSetStr(fd, CP210x_IOCTL_SETSERIAL, newsn, strlen(newsn));
     cpSetPortConf(fd, nopullups);
     cpReset(fd);
     cpDisconnect(fd);