Skip to content

Commit 8088975

Browse files
committed
Consistency and whitespace changes.
1 parent 306f09d commit 8088975

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

Lab4 LED/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ int main(void)
6464
{
6565
unsigned int i, select;
6666

67-
//start
68-
6967
/* Enable LED. 3 bits per GPIO so 10 GPIOs per select register. */
7068
#if RPI == 4
7169
/* GPIO 42 is 2nd register in GPFSEL4, so 2 * 3 bits or bit 6. */
@@ -141,6 +139,9 @@ int main(void)
141139
select = REG32(GPFSEL4);
142140
#endif /* RPI == 4 */
143141

142+
/*
143+
* Enable the JTAG GPIOs
144+
*/
144145

145146
#if RPI == 4
146147
/* 2 bits per PUP GPIO */

Lab8 Operating System/applications/bootloader/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PLINK = arm-none-eabi-objcopy
2424
APPNAME = bootloader
2525

2626
# Define the RPI hardware version: 1 is up to B+, 2 is 2, 3 is up to 3 B+
27-
EXTRAS = -DRPI=4 -ffreestanding
27+
EXTRAS = -DRPI=3 -ffreestanding
2828
# Begin Historic/Depricated/Older GCC
2929
#RPI 3 B+
3030
#EXTRAS = -DRPI=3 -march=armv8-a+crc -mtune=cortex-a53 -ffreestanding

Lab9 Framebuffer/boards/rpi/property.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ typedef struct PropertyDisplayDimensions
103103
u32 vHeight;
104104
PropertyTag dTag; // Depth
105105
u32 depth;
106-
PropertyTag fTag; // Framebuffer
106+
PropertyTag fTag; // Framebuffer
107107
u32 bufferAddr;
108108
u32 bufferSize;
109109
}
@@ -179,7 +179,7 @@ static u32 write_read(u32 channel, uintptr_t data)
179179

180180
// Read and return mailbox result
181181
result = read(channel);
182-
182+
183183
// Output error if result of read does not match write channel
184184
if ((result & 0x0F) != channel)
185185
puts("Read channel does not match write!");
@@ -204,8 +204,8 @@ static int property_get(void *property, u32 propertySize)
204204
u8 buffer[bufferSize + 15];
205205
// Adjust pointer so that it is exactly 16 byte aligned
206206
PropertyBuffer *propBuffer =
207-
(PropertyBuffer *)(((u32)buffer + 15) & ~15);
208-
/* __attribute__((aligned(16))) */
207+
(PropertyBuffer *)(((u32)buffer + 15) & ~15);
208+
/* __attribute__((aligned(16))) */
209209
u32 *endTag, bufferAddress;
210210

211211
// Initialize with size, request code and copy tags
@@ -221,7 +221,7 @@ static int property_get(void *property, u32 propertySize)
221221
// reading back the result, which will match the write if success
222222
bufferAddress = GPU_MEM_BASE | (u32)propBuffer;
223223
if (write_read(CHANNEL_PROPERTY_TAGS_OUT, bufferAddress) !=
224-
bufferAddress)
224+
bufferAddress)
225225
{
226226
puts("write_read() failed");
227227
return -1;
@@ -261,13 +261,13 @@ u32 SetDisplayResolution(u32 *width, u32 *height, u32 *depth,
261261
dimensions.pTag.code = CODE_REQUEST;
262262
dimensions.pWidth = *width;
263263
dimensions.pHeight = *height;
264-
264+
265265
dimensions.vTag.tagId = TAG_SET_VIRTUAL_WIDTH_HEIGHT;
266266
dimensions.vTag.bufSize = 8; // 4 bytes each width and height
267267
dimensions.vTag.code = CODE_REQUEST;
268268
dimensions.vWidth = *width;
269269
dimensions.vHeight = *height;
270-
270+
271271
dimensions.dTag.tagId = TAG_SET_BUFFER_DEPTH;
272272
dimensions.dTag.bufSize = 4; // 4 bytes depth
273273
dimensions.dTag.code = CODE_REQUEST;

0 commit comments

Comments
 (0)