CVS: msp430-libc/include/msp430 dac12.h,1.4,1.5 opamp.h,1.2,1.3
Steve Underwood <[email protected]>
| Newsgroups | gmane.comp.hardware.texas-instruments.msp430.gcc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/mspgcc/msp430-libc/include/msp430 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19209/msp430-libc/include/msp430 Modified Files: dac12.h opamp.h Log Message: Corrections for the G43x devices Index: dac12.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430/dac12.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -d -r1.4 -r1.5 --- dac12.h 15 Feb 2004 12:55:47 -0000 1.4 +++ dac12.h 3 Nov 2004 14:29:10 -0000 1.5 @@ -12,7 +12,7 @@ * $Id$ */ -/* Switches: none */ +/* Switches: __msp430_have_dac12_op_amp */ #define DAC12_0CTL_ 0x01C0 /* DAC12 control 0 */ sfrw(DAC12_0CTL,DAC12_0CTL_); @@ -38,6 +38,9 @@ #define DAC12RES 0x1000 /* DAC12 resolution */ #define DAC12SREF0 0x2000 /* DAC12 reference bit 0 */ #define DAC12SREF1 0x4000 /* DAC12 reference bit 1 */ +#if defined(__msp430_have_dac12_op_amp) +#define DAC12OPS 0x8000 /* DAC12 Operation Amp. */ +#endif #define DAC12AMP_0 (0<<5) /* DAC12 amplifier 0: off, 3-state */ #define DAC12AMP_1 (1<<5) /* DAC12 amplifier 1: off, off */ Index: opamp.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430/opamp.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -d -r1.2 -r1.3 --- opamp.h 26 Oct 2004 00:13:25 -0000 1.2 +++ opamp.h 3 Nov 2004 14:29:10 -0000 1.3 @@ -26,148 +26,52 @@ #define OA2CTL1_ 0x00C5 /* OA2 Control register 1 */ sfrb(OA2CTL1, OA2CTL1_); -#define OA0ADC0 (0x01) /* OA0 output to ADC12 input channel select 0 */ -#define OA0ADC1 (0x02) /* OA0 output to ADC12 input channel select 1 */ -#define OA0PM0 (0x04) /* OA0 Power mode select 0 */ -#define OA0PM1 (0x08) /* OA0 Power mode select 1 */ -#define OA0P0 (0x10) /* OA0 Inverting input select 0 */ -#define OA0P1 (0x20) /* OA0 Inverting input select 1 */ -#define OA0N0 (0x40) /* OA0 Non-inverting input select 0 */ -#define OA0N1 (0x80) /* OA0 Non-inverting input select 1 */ - -#define OA0PM_0 (0x00) /* OA0 Power mode select: off */ -#define OA0PM_1 (0x04) /* OA0 Power mode select: slow */ -#define OA0PM_2 (0x08) /* OA0 Power mode select: meduim */ -#define OA0PM_3 (0x0C) /* OA0 Power mode select: fast */ -#define OA0P_0 (0x00) /* OA0 Inverting input select 00 */ -#define OA0P_1 (0x10) /* OA0 Inverting input select 01 */ -#define OA0P_2 (0x20) /* OA0 Inverting input select 10 */ -#define OA0P_3 (0x30) /* OA0 Inverting input select 11 */ -#define OA0N_0 (0x40) /* OA0 Non-inverting input select 00 */ -#define OA0N_1 (0x40) /* OA0 Non-inverting input select 01 */ -#define OA0N_2 (0x80) /* OA0 Non-inverting input select 10 */ -#define OA0N_3 (0x40) /* OA0 Non-inverting input select 11 */ - -#define OA0RRIP (0x01) /* OA0 Rail-to-Rail Input off */ -//#define Reserved (0x02) /* */ -#define OA0FC0 (0x04) /* OA0 Function control 0 */ -#define OA0FC1 (0x08) /* OA0 Function control 1 */ -#define OA0FC2 (0x10) /* OA0 Function control 2 */ -#define OA0FBR0 (0x20) /* OA0 Feedback resistor select 0 */ -#define OA0FBR1 (0x40) /* OA0 Feedback resistor select 1 */ -#define OA0FBR2 (0x80) /* OA0 Feedback resistor select 2 */ - -#define OA0FC_0 (0x00) /* OA0 Function: Gen. Purpose */ -#define OA0FC_1 (0x04) /* OA0 Function: Comparing */ -#define OA0FC_2 (0x08) /* OA0 Function: Reserved */ -#define OA0FC_3 (0x0C) /* OA0 Function: Differential */ -#define OA0FC_4 (0x10) /* OA0 Function: Non-Inverting, PGA */ -#define OA0FC_5 (0x14) /* OA0 Function: Reserved */ -#define OA0FC_6 (0x18) /* OA0 Function: Inverting */ -#define OA0FC_7 (0x1C) /* OA0 Function: Differential */ -#define OA0FBR_0 (0x00) /* OA0 Feedback resistor: Tap 0 */ -#define OA0FBR_1 (0x20) /* OA0 Feedback resistor: Tap 1 */ -#define OA0FBR_2 (0x40) /* OA0 Feedback resistor: Tap 2 */ -#define OA0FBR_3 (0x60) /* OA0 Feedback resistor: Tap 3 */ -#define OA0FBR_4 (0x80) /* OA0 Feedback resistor: Tap 4 */ -#define OA0FBR_5 (0xA0) /* OA0 Feedback resistor: Tap 5 */ -#define OA0FBR_6 (0xC0) /* OA0 Feedback resistor: Tap 6 */ -#define OA0FBR_7 (0xE0) /* OA0 Feedback resistor: Tap 7 */ - -#define OA1ADC0 (0x01) /* OA1 output to ADC12 input channel select 0 */ -#define OA1ADC1 (0x02) /* OA1 output to ADC12 input channel select 1 */ -#define OA1PM0 (0x04) /* OA1 Power mode select 0 */ -#define OA1PM1 (0x08) /* OA1 Power mode select 1 */ -#define OA1P0 (0x10) /* OA1 Inverting input select 0 */ -#define OA1P1 (0x20) /* OA1 Inverting input select 1 */ -#define OA1N0 (0x40) /* OA1 Non-inverting input select 0 */ -#define OA1N1 (0x80) /* OA1 Non-inverting input select 1 */ - -#define OA1PM_0 (0x00) /* OA1 Power mode select: off */ -#define OA1PM_1 (0x04) /* OA1 Power mode select: slow */ -#define OA1PM_2 (0x08) /* OA1 Power mode select: meduim */ -#define OA1PM_3 (0x0C) /* OA1 Power mode select: fast */ -#define OA1P_0 (0x00) /* OA1 Inverting input select 00 */ -#define OA1P_1 (0x10) /* OA1 Inverting input select 01 */ -#define OA1P_2 (0x20) /* OA1 Inverting input select 10 */ -#define OA1P_3 (0x30) /* OA1 Inverting input select 11 */ -#define OA1N_0 (0x40) /* OA1 Non-inverting input select 00 */ -#define OA1N_1 (0x40) /* OA1 Non-inverting input select 01 */ -#define OA1N_2 (0x80) /* OA1 Non-inverting input select 10 */ -#define OA1N_3 (0x40) /* OA1 Non-inverting input select 11 */ - -#define OA1RRIP (0x01) /* OA1 Rail-to-Rail Input off */ -//#define Reserved (0x02) /* */ -#define OA1FC0 (0x04) /* OA1 Function control 0 */ -#define OA1FC1 (0x08) /* OA1 Function control 1 */ -#define OA1FC2 (0x10) /* OA1 Function control 2 */ -#define OA1FBR0 (0x20) /* OA1 Feedback resistor select 0 */ -#define OA1FBR1 (0x40) /* OA1 Feedback resistor select 1 */ -#define OA1FBR2 (0x80) /* OA1 Feedback resistor select 2 */ - -#define OA1FC_0 (0x00) /* OA1 Function: Gen. Purpose */ -#define OA1FC_1 (0x04) /* OA1 Function: Comparing */ -#define OA1FC_2 (0x08) /* OA1 Function: Reserved */ -#define OA1FC_3 (0x0C) /* OA1 Function: Differential */ -#define OA1FC_4 (0x10) /* OA1 Function: Non-Inverting, PGA */ -#define OA1FC_5 (0x14) /* OA1 Function: Reserved */ -#define OA1FC_6 (0x18) /* OA1 Function: Inverting */ -#define OA1FC_7 (0x1C) /* OA1 Function: Differential */ -#define OA1FBR_0 (0x00) /* OA1 Feedback resistor: Tap 0 */ -#define OA1FBR_1 (0x20) /* OA1 Feedback resistor: Tap 1 */ -#define OA1FBR_2 (0x40) /* OA1 Feedback resistor: Tap 2 */ -#define OA1FBR_3 (0x60) /* OA1 Feedback resistor: Tap 3 */ -#define OA1FBR_4 (0x80) /* OA1 Feedback resistor: Tap 4 */ -#define OA1FBR_5 (0xA0) /* OA1 Feedback resistor: Tap 5 */ -#define OA1FBR_6 (0xC0) /* OA1 Feedback resistor: Tap 6 */ -#define OA1FBR_7 (0xE0) /* OA1 Feedback resistor: Tap 7 */ - -#define OA2ADC0 (0x01) /* OA2 output to ADC12 input channel select 0 */ -#define OA2ADC1 (0x02) /* OA2 output to ADC12 input channel select 1 */ -#define OA2PM0 (0x04) /* OA2 Power mode select 0 */ -#define OA2PM1 (0x08) /* OA2 Power mode select 1 */ -#define OP2P0 (0x00) /* OA2 Inverting input select 0 */ -#define OA2P1 (0x20) /* OA2 Inverting input select 1 */ -#define OA2N0 (0x40) /* OA2 Non-inverting input select 0 */ -#define OA2N1 (0xC0) /* OA2 Non-inverting input select 1 */ +#define OAADC0 (0x01) /* 0Ax output to ADC12 input channel select 0 */ +#define OAADC1 (0x02) /* 0Ax output to ADC12 input channel select 1 */ +#define OAPM0 (0x04) /* 0Ax Power mode select 0 */ +#define OAPM1 (0x08) /* 0Ax Power mode select 1 */ +#define OAP0 (0x10) /* 0Ax Inverting input select 0 */ +#define OAP1 (0x20) /* 0Ax Inverting input select 1 */ +#define OAN0 (0x40) /* 0Ax Non-inverting input select 0 */ +#define OAN1 (0x80) /* 0Ax Non-inverting input select 1 */ -#define OA2PM_0 (0x00) /* OA2 Power mode select: off */ -#define OA2PM_1 (0x04) /* OA2 Power mode select: slow */ -#define OA2PM_2 (0x08) /* OA2 Power mode select: meduim */ -#define OA2PM_3 (0x0C) /* OA2 Power mode select: fast */ -#define OA2P_0 (0x00) /* OA2 Inverting input select 00 */ -#define OA2P_1 (0x10) /* OA2 Inverting input select 01 */ -#define OA2P_2 (0x20) /* OA2 Inverting input select 10 */ -#define OA2P_3 (0x30) /* OA2 Inverting input select 11 */ -#define OA2N_0 (0x40) /* OA2 Non-inverting input select 00 */ -#define OA2N_1 (0x40) /* OA2 Non-inverting input select 01 */ -#define OA2N_2 (0x80) /* OA2 Non-inverting input select 10 */ -#define OA2N_3 (0x40) /* OA2 Non-inverting input select 11 */ +#define OAPM_0 (0x00) /* 0Ax Power mode select: off */ +#define OAPM_1 (0x04) /* 0Ax Power mode select: slow */ +#define OAPM_2 (0x08) /* 0Ax Power mode select: medium */ +#define OAPM_3 (0x0C) /* 0Ax Power mode select: fast */ +#define OAP_0 (0x00) /* 0Ax Inverting input select 00 */ +#define OAP_1 (0x10) /* 0Ax Inverting input select 01 */ +#define OAP_2 (0x20) /* 0Ax Inverting input select 10 */ +#define OAP_3 (0x30) /* 0Ax Inverting input select 11 */ +#define OAN_0 (0x40) /* 0Ax Non-inverting input select 00 */ +#define OAN_1 (0x40) /* 0Ax Non-inverting input select 01 */ +#define OAN_2 (0x80) /* 0Ax Non-inverting input select 10 */ +#define OAN_3 (0x40) /* 0Ax Non-inverting input select 11 */ -#define OA2RRIP (0x01) /* OA2 Rail-to-Rail Input off */ +#define 0ARRIP (0x01) /* 0Ax Rail-to-Rail Input off */ //#define Reserved (0x02) /* */ -#define OA2FC0 (0x04) /* OA2 Function control 0 */ -#define OA2FC1 (0x08) /* OA2 Function control 1 */ -#define OA2FC2 (0x10) /* OA2 Function control 2 */ -#define OA2FBR0 (0x20) /* OA2 Feedback resistor select 0 */ -#define OA2FBR1 (0x40) /* OA2 Feedback resistor select 1 */ -#define OA2FBR2 (0x80) /* OA2 Feedback resistor select 2 */ +#define 0AFC0 (0x04) /* 0Ax Function control 0 */ +#define 0AFC1 (0x08) /* 0Ax Function control 1 */ +#define 0AFC2 (0x10) /* 0Ax Function control 2 */ +#define 0AFBR0 (0x20) /* 0Ax Feedback resistor select 0 */ +#define 0AFBR1 (0x40) /* 0Ax Feedback resistor select 1 */ +#define 0AFBR2 (0x80) /* 0Ax Feedback resistor select 2 */ -#define OA2FC_0 (0x00) /* OA2 Function: Gen. Purpose */ -#define OA2FC_1 (0x04) /* OA2 Function: Comparing */ -#define OA2FC_2 (0x08) /* OA2 Function: Reserved */ -#define OA2FC_3 (0x0C) /* OA2 Function: Differential */ -#define OA2FC_4 (0x10) /* OA2 Function: Non-Inverting, PGA */ -#define OA2FC_5 (0x14) /* OA2 Function: Reserved */ -#define OA2FC_6 (0x18) /* OA2 Function: Inverting */ -#define OA2FC_7 (0x1C) /* OA2 Function: Differential */ -#define OA2FBR_0 (0x00) /* OA2 Feedback resistor: Tap 0 */ -#define OA2FBR_1 (0x20) /* OA2 Feedback resistor: Tap 1 */ -#define OA2FBR_2 (0x40) /* OA2 Feedback resistor: Tap 2 */ -#define OA2FBR_3 (0x60) /* OA2 Feedback resistor: Tap 3 */ -#define OA2FBR_4 (0x80) /* OA2 Feedback resistor: Tap 4 */ -#define OA2FBR_5 (0xA0) /* OA2 Feedback resistor: Tap 5 */ -#define OA2FBR_6 (0xC0) /* OA2 Feedback resistor: Tap 6 */ -#define OA2FBR_7 (0xE0) /* OA2 Feedback resistor: Tap 7 */ +#define 0AFC_0 (0x00) /* 0Ax Function: Gen. Purpose */ +#define 0AFC_1 (0x04) /* 0Ax Function: Comparing */ +#define 0AFC_2 (0x08) /* 0Ax Function: Reserved */ +#define 0AFC_3 (0x0C) /* 0Ax Function: Differential */ +#define 0AFC_4 (0x10) /* 0Ax Function: Non-Inverting, PGA */ +#define 0AFC_5 (0x14) /* 0Ax Function: Reserved */ +#define 0AFC_6 (0x18) /* 0Ax Function: Inverting */ +#define 0AFC_7 (0x1C) /* 0Ax Function: Differential */ +#define 0AFBR_0 (0x00) /* 0Ax Feedback resistor: Tap 0 */ +#define 0AFBR_1 (0x20) /* 0Ax Feedback resistor: Tap 1 */ +#define 0AFBR_2 (0x40) /* 0Ax Feedback resistor: Tap 2 */ +#define 0AFBR_3 (0x60) /* 0Ax Feedback resistor: Tap 3 */ +#define 0AFBR_4 (0x80) /* 0Ax Feedback resistor: Tap 4 */ +#define 0AFBR_5 (0xA0) /* 0Ax Feedback resistor: Tap 5 */ +#define 0AFBR_6 (0xC0) /* 0Ax Feedback resistor: Tap 6 */ +#define 0AFBR_7 (0xE0) /* 0Ax Feedback resistor: Tap 7 */ #endif ------------------------------------------------------- This SF.Net email is sponsored by: Sybase ASE Linux Express Edition - download now for FREE LinuxWorld Reader's Choice Award Winner for best database on Linux. http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click