diff options
author | (no author) <(no author)@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2006-09-09 04:42:17 +0000 |
---|---|---|
committer | (no author) <(no author)@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2006-09-09 04:42:17 +0000 |
commit | 83c18361d821819208e5d8024e8b557c359fdc7d (patch) | |
tree | 78bf53a2540e36207638c4735b116432299a998d /openpcd/firmware/src/pcd | |
parent | 3a98ae12852a75f2331571fafb148f55ee073969 (diff) |
- cosmetic cleanup
git-svn-id: https://svn.openpcd.org:2342/trunk@146 6dc7ffe9-61d6-0310-9af1-9938baff3ed1
Diffstat (limited to 'openpcd/firmware/src/pcd')
-rw-r--r-- | openpcd/firmware/src/pcd/main_analog.c | 1 | ||||
-rw-r--r-- | openpcd/firmware/src/pcd/main_dumbreader.c | 2 | ||||
-rw-r--r-- | openpcd/firmware/src/pcd/main_pwm.c | 2 | ||||
-rw-r--r-- | openpcd/firmware/src/pcd/main_reqa.c | 1 | ||||
-rw-r--r-- | openpcd/firmware/src/pcd/pwm.c | 4 | ||||
-rw-r--r-- | openpcd/firmware/src/pcd/rc632.c | 2 |
6 files changed, 3 insertions, 9 deletions
diff --git a/openpcd/firmware/src/pcd/main_analog.c b/openpcd/firmware/src/pcd/main_analog.c index 45869e1..8ffa1d4 100644 --- a/openpcd/firmware/src/pcd/main_analog.c +++ b/openpcd/firmware/src/pcd/main_analog.c @@ -19,7 +19,6 @@ void _init_func(void) { - //udp_init(); trigger_init(); rc632_init(); DEBUGPCRF("turning on RF"); diff --git a/openpcd/firmware/src/pcd/main_dumbreader.c b/openpcd/firmware/src/pcd/main_dumbreader.c index 9e20876..1535e27 100644 --- a/openpcd/firmware/src/pcd/main_dumbreader.c +++ b/openpcd/firmware/src/pcd/main_dumbreader.c @@ -12,8 +12,6 @@ void _init_func(void) { rc632_init(); - udp_init(); - udp_open(); rc632_test(RAH); } diff --git a/openpcd/firmware/src/pcd/main_pwm.c b/openpcd/firmware/src/pcd/main_pwm.c index 85d304a..691c27d 100644 --- a/openpcd/firmware/src/pcd/main_pwm.c +++ b/openpcd/firmware/src/pcd/main_pwm.c @@ -95,8 +95,6 @@ void _init_func(void) pwm_duty_set_percent(0, 22); /* 22% of 9.43uS = 2.07uS */ rc632_modulate_mfin(); - udp_init(); - DEBUGPCRF("Initializing SSC RX"); ssc_rx_init(); } diff --git a/openpcd/firmware/src/pcd/main_reqa.c b/openpcd/firmware/src/pcd/main_reqa.c index 179b423..e28fdff 100644 --- a/openpcd/firmware/src/pcd/main_reqa.c +++ b/openpcd/firmware/src/pcd/main_reqa.c @@ -26,7 +26,6 @@ void _init_func(void) { - //udp_init(); trigger_init(); DEBUGPCRF("enabling RC632"); rc632_init(); diff --git a/openpcd/firmware/src/pcd/pwm.c b/openpcd/firmware/src/pcd/pwm.c index ef1ee3f..e05699b 100644 --- a/openpcd/firmware/src/pcd/pwm.c +++ b/openpcd/firmware/src/pcd/pwm.c @@ -107,7 +107,7 @@ void pwm_duty_set_percent(int channel, u_int16_t duty) static int pwm_usb_in(struct req_ctx *rctx) { struct openpcd_hdr *poh = (struct openpcd_hdr *) &rctx->rx.data[0]; - struct openpcd_hdr *pih = (struct openpcd_hdr *) &rctx->tx.data[0]; + /* struct openpcd_hdr *pih = (struct openpcd_hdr *) &rctx->tx.data[0]; */ u_int32_t *freq; switch (poh->cmd) { @@ -126,7 +126,7 @@ static int pwm_usb_in(struct req_ctx *rctx) case OPENPCD_CMD_PWM_FREQ_SET: if (rctx->rx.tot_len < sizeof(*poh)+4) break; - freq = (void *) poh + sizeof(*poh); + freq = (unsigned char *) poh + sizeof(*poh); pwm_freq_set(0, *freq); break; case OPENPCD_CMD_PWM_FREQ_GET: diff --git a/openpcd/firmware/src/pcd/rc632.c b/openpcd/firmware/src/pcd/rc632.c index 9fc7428..620d0a0 100644 --- a/openpcd/firmware/src/pcd/rc632.c +++ b/openpcd/firmware/src/pcd/rc632.c @@ -397,7 +397,7 @@ static int rc632_usb_in(struct req_ctx *rctx) break; case OPENPCD_CMD_READ_FIFO: { - u_int16_t req_len = poh->val, remain_len, pih_len; + u_int16_t req_len = poh->val, remain_len = req_len, pih_len; if (req_len > MAX_PAYLOAD_LEN) { pih_len = MAX_PAYLOAD_LEN; remain_len -= pih_len; |