summaryrefslogtreecommitdiff
path: root/firmware/lib/include/vboot_audio_private.h
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/lib/include/vboot_audio_private.h')
-rw-r--r--firmware/lib/include/vboot_audio_private.h43
1 files changed, 21 insertions, 22 deletions
diff --git a/firmware/lib/include/vboot_audio_private.h b/firmware/lib/include/vboot_audio_private.h
index 236cc09c..902bc62e 100644
--- a/firmware/lib/include/vboot_audio_private.h
+++ b/firmware/lib/include/vboot_audio_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
@@ -12,32 +12,32 @@
#include "vboot_audio.h"
typedef struct VbDevMusicNote {
- uint16_t msec;
- uint16_t frequency;
+ uint16_t msec;
+ uint16_t frequency;
} __attribute__((packed)) VbDevMusicNote;
typedef struct VbDevMusic {
- uint8_t sig[4]; /* "$SND" */
- uint32_t checksum; /* crc32 over count & all notes */
- uint32_t count; /* number of notes */
- VbDevMusicNote notes[1]; /* gcc allows [0], MSVC doesn't */
- /* more VbDevMusicNotes follow immediately */
+ uint8_t sig[4]; /* "$SND" */
+ uint32_t checksum; /* crc32 over count & all notes */
+ uint32_t count; /* number of notes */
+ VbDevMusicNote notes[1]; /* gcc allows [0], MSVC doesn't */
+ /* more VbDevMusicNotes follow immediately */
} __attribute__((packed)) VbDevMusic;
struct VbAudioContext {
- /* note tracking */
- VbDevMusicNote* music_notes;
- uint32_t note_count;
- uint32_t next_note;
-
- /* implementation flags */
- int background_beep;
- int free_notes_when_done;
-
- /* sound tracking */
- uint16_t current_frequency;
- uint64_t play_until;
- uint64_t last_time;
+ /* note tracking */
+ VbDevMusicNote *music_notes;
+ uint32_t note_count;
+ uint32_t next_note;
+
+ /* implementation flags */
+ int background_beep;
+ int free_notes_when_done;
+
+ /* sound tracking */
+ uint16_t current_frequency;
+ uint64_t play_until;
+ uint64_t last_time;
};
#ifdef FOR_TEST
@@ -55,4 +55,3 @@ uint32_t VbExMaxMusicSize(void);
#endif
#endif /* VBOOT_REFERENCE_VBOOT_AUDIO_PRIVATE_H_ */
-