gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant type information for bitfield elements, other than the signed/unsignedness of the element.

Browse Source 
Change type of USB_SelectedPipe and USB_SelectedEndpoint for the AVR32 UC3 architecture to uint32_t to reduce the compiled code size.
This commit is contained in:
Dean Camera 2011-04-10 06:43:02 +00:00
parent d08116b02f
commit 852b5e612d
18 changed files with 195 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.h
View File

@ -72,14 +72,14 @@
/** Type define of an IP packet header. */ /** Type define of an IP packet header. */
typedef struct typedef struct
{ {
unsigned char HeaderLength : 4; /**< Total length of the packet header, in 4-byte blocks */ unsigned HeaderLength : 4; /**< Total length of the packet header, in 4-byte blocks */
unsigned char Version : 4; /**< IP protocol version */ unsigned Version : 4; /**< IP protocol version */
uint8_t TypeOfService; /**< Special service type identifier, indicating delay/throughput/reliability levels */ uint8_t TypeOfService; /**< Special service type identifier, indicating delay/throughput/reliability levels */
uint16_t TotalLength; /**< Total length of the IP packet, in bytes */ uint16_t TotalLength; /**< Total length of the IP packet, in bytes */
uint16_t Identification; /**< Identification value for identifying fragmented packets */ uint16_t Identification; /**< Identification value for identifying fragmented packets */
unsigned int FragmentOffset : 13; /**< Offset of this IP fragment */ unsigned FragmentOffset : 13; /**< Offset of this IP fragment */
unsigned int Flags : 3; /**< Fragment flags, to indicate if a packet is fragmented */ unsigned Flags : 3; /**< Fragment flags, to indicate if a packet is fragmented */
uint8_t TTL; /**< Maximum allowable number of hops to reach the packet destination */ uint8_t TTL; /**< Maximum allowable number of hops to reach the packet destination */
uint8_t Protocol; /**< Encapsulated protocol type */ uint8_t Protocol; /**< Encapsulated protocol type */

4
Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.h
View File

@ -218,8 +218,8 @@
uint32_t SequenceNumber; /**< Data sequence number of the packet */ uint32_t SequenceNumber; /**< Data sequence number of the packet */
uint32_t AcknowledgmentNumber; /**< Data acknowledgment number of the packet */ uint32_t AcknowledgmentNumber; /**< Data acknowledgment number of the packet */
unsigned char Reserved : 4; /**< Reserved, must be all 0 */ unsigned Reserved : 4; /**< Reserved, must be all 0 */
unsigned char DataOffset : 4; /**< Offset of the data from the start of the header, in 4 byte chunks */ unsigned DataOffset : 4; /**< Offset of the data from the start of the header, in 4 byte chunks */
uint8_t Flags; /**< TCP packet flags */ uint8_t Flags; /**< TCP packet flags */
uint16_t WindowSize; /**< Current data window size (bytes remaining in reception buffer) */ uint16_t WindowSize; /**< Current data window size (bytes remaining in reception buffer) */

6
Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.h
View File

@ -82,9 +82,9 @@
{ {
uint8_t TypeBytes[3]; uint8_t TypeBytes[3];
int ErrorCode : 6; unsigned ErrorCode : 6;
int NAK : 1; unsigned NAK : 1;
int Response : 1; unsigned Response : 1;
} TypeFields; } TypeFields;
} SideShowPacketType_t; } SideShowPacketType_t;

20
Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
View File

@ -90,16 +90,16 @@
struct struct
{ {
unsigned char ListenOnly : 1; unsigned ListenOnly : 1;
unsigned char TalkOnly : 1; unsigned TalkOnly : 1;
unsigned char PulseIndicateSupported : 1; unsigned PulseIndicateSupported : 1;
unsigned char Reserved : 5; unsigned Reserved : 5;
} Interface; } Interface;
struct struct
{ {
unsigned char SupportsAbortINOnMatch : 1; unsigned SupportsAbortINOnMatch : 1;
unsigned char Reserved : 7; unsigned Reserved : 7;
} Device; } Device;
uint8_t Reserved2[6]; uint8_t Reserved2[6];
@ -108,16 +108,16 @@
typedef struct typedef struct
{ {
unsigned char LastMessageTransaction : 1; unsigned LastMessageTransaction : 1;
unsigned char Reserved : 7; unsigned Reserved : 7;
uint8_t Reserved2[3]; uint8_t Reserved2[3];
} TMC_DevOUTMessageHeader_t; } TMC_DevOUTMessageHeader_t;
typedef struct typedef struct
{ {
unsigned char TermCharEnabled : 1; unsigned TermCharEnabled : 1;
unsigned char Reserved : 7; unsigned Reserved : 7;
uint8_t TermChar; uint8_t TermChar;
uint8_t Reserved2[2]; uint8_t Reserved2[2];

44
Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
View File

@ -79,31 +79,31 @@
*/ */
typedef struct typedef struct
{ {
unsigned char DeviceType : 5; unsigned DeviceType : 5;
unsigned char PeripheralQualifier : 3; unsigned PeripheralQualifier : 3;
unsigned char Reserved : 7; unsigned Reserved : 7;
unsigned char Removable : 1; unsigned Removable : 1;
uint8_t Version; uint8_t Version;
unsigned char ResponseDataFormat : 4; unsigned ResponseDataFormat : 4;
unsigned char Reserved2 : 1; unsigned Reserved2 : 1;
unsigned char NormACA : 1; unsigned NormACA : 1;
unsigned char TrmTsk : 1; unsigned TrmTsk : 1;
unsigned char AERC : 1; unsigned AERC : 1;
uint8_t AdditionalLength; uint8_t AdditionalLength;
uint8_t Reserved3[2]; uint8_t Reserved3[2];
unsigned char SoftReset : 1; unsigned SoftReset : 1;
unsigned char CmdQue : 1; unsigned CmdQue : 1;
unsigned char Reserved4 : 1; unsigned Reserved4 : 1;
unsigned char Linked : 1; unsigned Linked : 1;
unsigned char Sync : 1; unsigned Sync : 1;
unsigned char WideBus16Bit : 1; unsigned WideBus16Bit : 1;
unsigned char WideBus32Bit : 1; unsigned WideBus32Bit : 1;
unsigned char RelAddr : 1; unsigned RelAddr : 1;
uint8_t VendorID[8]; uint8_t VendorID[8];
uint8_t ProductID[16]; uint8_t ProductID[16];
@ -119,11 +119,11 @@
uint8_t SegmentNumber; uint8_t SegmentNumber;
unsigned char SenseKey : 4; unsigned SenseKey : 4;
unsigned char Reserved : 1; unsigned Reserved : 1;
unsigned char ILI : 1; unsigned ILI : 1;
unsigned char EOM : 1; unsigned EOM : 1;
unsigned char FileMark : 1; unsigned FileMark : 1;
uint8_t Information[4]; uint8_t Information[4];
uint8_t AdditionalLength; uint8_t AdditionalLength;

8
Demos/Device/LowLevel/RNDISEthernet/Lib/IP.h
View File

@ -72,14 +72,14 @@
/** Type define of an IP packet header. */ /** Type define of an IP packet header. */
typedef struct typedef struct
{ {
unsigned char HeaderLength : 4; /**< Total length of the packet header, in 4-byte blocks */ unsigned HeaderLength : 4; /**< Total length of the packet header, in 4-byte blocks */
unsigned char Version : 4; /**< IP protocol version */ unsigned Version : 4; /**< IP protocol version */
uint8_t TypeOfService; /**< Special service type identifier, indicating delay/throughput/reliability levels */ uint8_t TypeOfService; /**< Special service type identifier, indicating delay/throughput/reliability levels */
uint16_t TotalLength; /**< Total length of the IP packet, in bytes */ uint16_t TotalLength; /**< Total length of the IP packet, in bytes */
uint16_t Identification; /**< Identification value for identifying fragmented packets */ uint16_t Identification; /**< Identification value for identifying fragmented packets */
unsigned int FragmentOffset : 13; /**< Offset of this IP fragment */ unsigned FragmentOffset : 13; /**< Offset of this IP fragment */
unsigned int Flags : 3; /**< Fragment flags, to indicate if a packet is fragmented */ unsigned Flags : 3; /**< Fragment flags, to indicate if a packet is fragmented */
uint8_t TTL; /**< Maximum allowable number of hops to reach the packet destination */ uint8_t TTL; /**< Maximum allowable number of hops to reach the packet destination */
uint8_t Protocol; /**< Encapsulated protocol type */ uint8_t Protocol; /**< Encapsulated protocol type */

4
Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
View File

@ -219,8 +219,8 @@
uint32_t SequenceNumber; /**< Data sequence number of the packet */ uint32_t SequenceNumber; /**< Data sequence number of the packet */
uint32_t AcknowledgmentNumber; /**< Data acknowledgment number of the packet */ uint32_t AcknowledgmentNumber; /**< Data acknowledgment number of the packet */
unsigned char Reserved : 4; /**< Reserved, must be all 0 */ unsigned Reserved : 4; /**< Reserved, must be all 0 */
unsigned char DataOffset : 4; /**< Offset of the data from the start of the header, in 4 byte chunks */ unsigned DataOffset : 4; /**< Offset of the data from the start of the header, in 4 byte chunks */
uint8_t Flags; /**< TCP packet flags */ uint8_t Flags; /**< TCP packet flags */
uint16_t WindowSize; /**< Current data window size (bytes remaining in reception buffer) */ uint16_t WindowSize; /**< Current data window size (bytes remaining in reception buffer) */

16
Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h
View File

@ -77,9 +77,9 @@
/* Type Defines: */ /* Type Defines: */
typedef struct typedef struct
{ {
unsigned char EA : 1; unsigned EA : 1;
unsigned char CR : 1; unsigned CR : 1;
unsigned char DLCI : 6; unsigned DLCI : 6;
} RFCOMM_Address_t; } RFCOMM_Address_t;
typedef struct typedef struct
@ -90,16 +90,16 @@
typedef struct typedef struct
{ {
unsigned char EA : 1; unsigned EA : 1;
unsigned char CR : 1; unsigned CR : 1;
unsigned char Command : 6; unsigned Command : 6;
} RFCOMM_Command_t; } RFCOMM_Command_t;
typedef struct typedef struct
{ {
uint8_t DLCI; uint8_t DLCI;
unsigned char FrameType : 4; unsigned FrameType : 4;
unsigned char ConvergenceLayer : 4; unsigned ConvergenceLayer : 4;
uint8_t Priority; uint8_t Priority;
uint8_t ACKTimerTicks; uint8_t ACKTimerTicks;
uint16_t MaximumFrameSize; uint16_t MaximumFrameSize;

46
LUFA/Common/Common.h
View File

@ -99,7 +99,7 @@
#define pgm_read_byte(x) *x #define pgm_read_byte(x) *x
#define memcmp_P(...) memcmp(__VA_ARGS__) #define memcmp_P(...) memcmp(__VA_ARGS__)
#define memcpy_P(...) memcpy(__VA_ARGS__) #define memcpy_P(...) memcpy(__VA_ARGS__)
// ================================================== // =================================================
typedef uint32_t uint_reg_t; typedef uint32_t uint_reg_t;
@ -159,6 +159,8 @@
* be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimiser * be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimiser
* removes/reorders code to the point where break points cannot reliably be set. * removes/reorders code to the point where break points cannot reliably be set.
* *
* \note This macro is not available for all architectures.
*
* \ingroup Group_Debugging * \ingroup Group_Debugging
*/ */
#define JTAG_DEBUG_POINT() __asm__ __volatile__ ("NOP" ::) #define JTAG_DEBUG_POINT() __asm__ __volatile__ ("NOP" ::)
@ -166,27 +168,17 @@
/** Defines an explicit JTAG break point in the resulting binary via the assembly \c BREAK statement. When /** Defines an explicit JTAG break point in the resulting binary via the assembly \c BREAK statement. When
* a JTAG is used, this causes the program execution to halt when reached until manually resumed. * a JTAG is used, this causes the program execution to halt when reached until manually resumed.
* *
* \note This macro is not available for all architectures.
*
* \ingroup Group_Debugging * \ingroup Group_Debugging
*/ */
#define JTAG_DEBUG_BREAK() __asm__ __volatile__ ("BREAK" ::) #define JTAG_DEBUG_BREAK() __asm__ __volatile__ ("BREAK" ::)
#if !defined(pgm_read_ptr) || defined(__DOXYGEN__)
/** Reads a pointer out of PROGMEM space on the AVR8 architecture. This is currently a wrapper for the
* avr-libc \c pgm_read_ptr() macro with a \c void* cast, so that its value can be assigned directly
* to a pointer variable or used in pointer arithmetic without further casting in C. In a future
* avr-libc distribution this will be part of the standard API and will be implemented in a more formal
* manner.
*
* \param[in] Addr Address of the pointer to read.
*
* \return Pointer retrieved from PROGMEM space.
*/
#define pgm_read_ptr(Addr) (void*)pgm_read_word(Addr)
#endif
/** Macro for testing condition "x" and breaking via \ref JTAG_DEBUG_BREAK() if the condition is false. /** Macro for testing condition "x" and breaking via \ref JTAG_DEBUG_BREAK() if the condition is false.
* *
* \param[in] Condition Condition that will be evaluated, * \note This macro is not available for all architectures.
*
* \param[in] Condition Condition that will be evaluated.
* *
* \ingroup Group_Debugging * \ingroup Group_Debugging
*/ */
@ -198,6 +190,8 @@
* *
* The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {Condition} failed." * The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {Condition} failed."
* *
* \note This macro is not available for all architectures.
*
* \param[in] Condition Condition that will be evaluated, * \param[in] Condition Condition that will be evaluated,
* *
* \ingroup Group_Debugging * \ingroup Group_Debugging
@ -205,6 +199,22 @@
#define STDOUT_ASSERT(Condition) MACROS{ if (!(x)) { printf_P(PSTR("%s: Function \"%s\", Line %d: " \ #define STDOUT_ASSERT(Condition) MACROS{ if (!(x)) { printf_P(PSTR("%s: Function \"%s\", Line %d: " \
"Assertion \"%s\" failed.\r\n"), \ "Assertion \"%s\" failed.\r\n"), \
__FILE__, __func__, __LINE__, #Condition); } }MACROE __FILE__, __func__, __LINE__, #Condition); } }MACROE
#if !defined(pgm_read_ptr) || defined(__DOXYGEN__)
/** Reads a pointer out of PROGMEM space on the AVR8 architecture. This is currently a wrapper for the
* avr-libc \c pgm_read_ptr() macro with a \c void* cast, so that its value can be assigned directly
* to a pointer variable or used in pointer arithmetic without further casting in C. In a future
* avr-libc distribution this will be part of the standard API and will be implemented in a more formal
* manner.
*
* \note This macro is not available for all architectures.
*
* \param[in] Address Address of the pointer to read.
*
* \return Pointer retrieved from PROGMEM space.
*/
#define pgm_read_ptr(Addr) (void*)pgm_read_word(Address)
#endif
#endif #endif
/** Forces GCC to use pointer indirection (via the device's pointer register pairs) when accessing the given /** Forces GCC to use pointer indirection (via the device's pointer register pairs) when accessing the given
@ -231,8 +241,8 @@
* Interrupt handlers written using this macro may still need to be registered with the microcontroller's * Interrupt handlers written using this macro may still need to be registered with the microcontroller's
* Interrupt Controller (if present) before they will properly handle incoming interrupt events. * Interrupt Controller (if present) before they will properly handle incoming interrupt events.
* *
* \note This is supplied on some architectures where the standard library does not include a valid * \note This macro is only supplied on some architectures, where the standard library does not include a valid
* definition. If an existing definition exists, the definition here will be ignored. * definition. If an existing definition exists, the alternative definition here will be ignored.
* *
* \ingroup Group_GlobalInt * \ingroup Group_GlobalInt
* *

4
LUFA/Drivers/USB/Class/Common/MIDI.h
View File

@ -272,8 +272,8 @@
*/ */
typedef struct typedef struct
{ {
unsigned char Command : 4; /**< Upper nibble of the MIDI command being sent or received in the event packet. */ unsigned Command : 4; /**< Upper nibble of the MIDI command being sent or received in the event packet. */
unsigned char CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface. */ unsigned CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface. */
uint8_t Data1; /**< First byte of data in the MIDI event. */ uint8_t Data1; /**< First byte of data in the MIDI event. */
uint8_t Data2; /**< Second byte of data in the MIDI event. */ uint8_t Data2; /**< Second byte of data in the MIDI event. */

44
LUFA/Drivers/USB/Class/Common/MassStorage.h
View File

@ -293,11 +293,11 @@
uint8_t SegmentNumber; uint8_t SegmentNumber;
unsigned char SenseKey : 4; unsigned SenseKey : 4;
unsigned char Reserved : 1; unsigned Reserved : 1;
unsigned char ILI : 1; unsigned ILI : 1;
unsigned char EOM : 1; unsigned EOM : 1;
unsigned char FileMark : 1; unsigned FileMark : 1;
uint8_t Information[4]; uint8_t Information[4];
uint8_t AdditionalLength; uint8_t AdditionalLength;
@ -318,31 +318,31 @@
*/ */
typedef struct typedef struct
{ {
unsigned char DeviceType : 5; unsigned DeviceType : 5;
unsigned char PeripheralQualifier : 3; unsigned PeripheralQualifier : 3;
unsigned char Reserved : 7; unsigned Reserved : 7;
unsigned char Removable : 1; unsigned Removable : 1;
uint8_t Version; uint8_t Version;
unsigned char ResponseDataFormat : 4; unsigned ResponseDataFormat : 4;
unsigned char Reserved2 : 1; unsigned Reserved2 : 1;
unsigned char NormACA : 1; unsigned NormACA : 1;
unsigned char TrmTsk : 1; unsigned TrmTsk : 1;
unsigned char AERC : 1; unsigned AERC : 1;
uint8_t AdditionalLength; uint8_t AdditionalLength;
uint8_t Reserved3[2]; uint8_t Reserved3[2];
unsigned char SoftReset : 1; unsigned SoftReset : 1;
unsigned char CmdQue : 1; unsigned CmdQue : 1;
unsigned char Reserved4 : 1; unsigned Reserved4 : 1;
unsigned char Linked : 1; unsigned Linked : 1;
unsigned char Sync : 1; unsigned Sync : 1;
unsigned char WideBus16Bit : 1; unsigned WideBus16Bit : 1;
unsigned char WideBus32Bit : 1; unsigned WideBus32Bit : 1;
unsigned char RelAddr : 1; unsigned RelAddr : 1;
uint8_t VendorID[8]; uint8_t VendorID[8];
uint8_t ProductID[16]; uint8_t ProductID[16];

1
LUFA/Drivers/USB/Class/Device/MIDI.h
View File

@ -91,6 +91,7 @@
} Config; /**< Config data for the USB class interface within the device. All elements in this section } Config; /**< Config data for the USB class interface within the device. All elements in this section
* <b>must</b> be set or the interface will fail to enumerate and operate correctly. * <b>must</b> be set or the interface will fail to enumerate and operate correctly.
*/ */
struct struct
{ {
// No state information for this class // No state information for this class

2
LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c
View File

@ -39,7 +39,7 @@
uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE; uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;
#endif #endif
volatile uint8_t USB_SelectedEndpoint = ENDPOINT_CONTROLEP; volatile uint32_t USB_SelectedEndpoint = ENDPOINT_CONTROLEP;
volatile uint8_t* USB_EndpointFIFOPos[ENDPOINT_TOTAL_ENDPOINTS]; volatile uint8_t* USB_EndpointFIFOPos[ENDPOINT_TOTAL_ENDPOINTS];
bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,

2
LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
View File

@ -155,7 +155,7 @@
const uint32_t UECFGXData); const uint32_t UECFGXData);
/* External Variables: */ /* External Variables: */
extern volatile uint8_t USB_SelectedEndpoint; extern volatile uint32_t USB_SelectedEndpoint;
extern volatile uint8_t* USB_EndpointFIFOPos[]; extern volatile uint8_t* USB_EndpointFIFOPos[];
#endif #endif

2
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
View File

@ -37,7 +37,7 @@
uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE; uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
volatile uint8_t USB_SelectedPipe = PIPE_CONTROLPIPE; volatile uint32_t USB_SelectedPipe = PIPE_CONTROLPIPE;
volatile uint8_t* USB_PipeFIFOPos[PIPE_TOTAL_PIPES]; volatile uint8_t* USB_PipeFIFOPos[PIPE_TOTAL_PIPES];
bool Pipe_ConfigurePipe(const uint8_t Number, bool Pipe_ConfigurePipe(const uint8_t Number,

2
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
View File

@ -102,7 +102,7 @@
#define PIPE_HSB_ADDRESS_SPACE_SIZE (64 * 1024UL) #define PIPE_HSB_ADDRESS_SPACE_SIZE (64 * 1024UL)
/* External Variables: */ /* External Variables: */
extern volatile uint8_t USB_SelectedPipe; extern volatile uint32_t USB_SelectedPipe;
extern volatile uint8_t* USB_PipeFIFOPos[]; extern volatile uint8_t* USB_PipeFIFOPos[];
#endif #endif

1
LUFA/ManPages/LUFAPoweredProjects.txt
View File

@ -55,6 +55,7 @@
* - IR Remote to Keyboard decoder: http://netzhansa.blogspot.com/2010/04/our-living-room-hi-fi-setup-needs-mp3.html * - IR Remote to Keyboard decoder: http://netzhansa.blogspot.com/2010/04/our-living-room-hi-fi-setup-needs-mp3.html
* - LED Panel controller: http://projects.peterpolidoro.net/caltech/panelscontroller/panelscontroller.htm * - LED Panel controller: http://projects.peterpolidoro.net/caltech/panelscontroller/panelscontroller.htm
* - LUFA powered DDR dance mat (French): http://logicien-parfait.fr/dokuwiki/doku.php?id=projet:ddr_repair * - LUFA powered DDR dance mat (French): http://logicien-parfait.fr/dokuwiki/doku.php?id=projet:ddr_repair
* - MIDI Theremin: http://baldwisdom.com/usb-midi-controller-theremin-style-on-arduino-uno/
* - Motherboard BIOS flasher: http://www.coreboot.org/InSystemFlasher * - Motherboard BIOS flasher: http://www.coreboot.org/InSystemFlasher
* - Multi-button Joystick (French): http://logicien-parfait.fr/dokuwiki/doku.php?id=projet:joystick * - Multi-button Joystick (French): http://logicien-parfait.fr/dokuwiki/doku.php?id=projet:joystick
* - Nikon wireless camera remote control (Norwegian): http://hekta.org/~hpe1119/ * - Nikon wireless camera remote control (Norwegian): http://hekta.org/~hpe1119/

40
Projects/TempDataLogger/Lib/DS1307.h
View File

@ -30,9 +30,9 @@
{ {
struct struct
{ {
unsigned int Sec : 4; unsigned Sec : 4;
unsigned int TenSec : 3; unsigned TenSec : 3;
unsigned int CH : 1; unsigned CH : 1;
} Fields; } Fields;
uint8_t IntVal; uint8_t IntVal;
@ -42,9 +42,9 @@
{ {
struct struct
{ {
unsigned int Min : 4; unsigned Min : 4;
unsigned int TenMin : 3; unsigned TenMin : 3;
unsigned int Reserved : 1; unsigned Reserved : 1;
} Fields; } Fields;
uint8_t IntVal; uint8_t IntVal;
@ -54,10 +54,10 @@
{ {
struct struct
{ {
unsigned int Hour : 4; unsigned Hour : 4;
unsigned int TenHour : 2; unsigned TenHour : 2;
unsigned int TwelveHourMode : 1; unsigned TwelveHourMode : 1;
unsigned int Reserved : 1; unsigned Reserved : 1;
} Fields; } Fields;
uint8_t IntVal; uint8_t IntVal;
@ -67,8 +67,8 @@
{ {
struct struct
{ {
unsigned int DayOfWeek : 3; unsigned DayOfWeek : 3;
unsigned int Reserved : 5; unsigned Reserved : 5;
} Fields; } Fields;
uint8_t IntVal; uint8_t IntVal;
@ -78,9 +78,9 @@
{ {
struct struct
{ {
unsigned int Day : 4; unsigned Day : 4;
unsigned int TenDay : 2; unsigned TenDay : 2;
unsigned int Reserved : 2; unsigned Reserved : 2;
} Fields; } Fields;
uint8_t IntVal; uint8_t IntVal;
@ -90,9 +90,9 @@
{ {
struct struct
{ {
unsigned int Month : 4; unsigned Month : 4;
unsigned int TenMonth : 1; unsigned TenMonth : 1;
unsigned int Reserved : 3; unsigned Reserved : 3;
} Fields; } Fields;
uint8_t IntVal; uint8_t IntVal;
@ -102,8 +102,8 @@
{ {
struct struct
{ {
unsigned int Year : 4; unsigned Year : 4;
unsigned int TenYear : 4; unsigned TenYear : 4;
} Fields; } Fields;
uint8_t IntVal; uint8_t IntVal;