Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pit: fix initialization #213

Merged
merged 2 commits into from
Oct 11, 2021
Merged

pit: fix initialization #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04a41af
pit: fix initialization
82marbag Oct 8, 2021
03cf422
Merge branch 'mainline' into mainline
82marbag Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions drivers/pit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@

void init_pit(uint8_t dst_cpus) {
printk("Initializing PIT\n");
outb(PIT_COMMAND_PORT,
PIT_CHANNEL_0 & PIT_ACCESS_MODE_LH & PIT_OP_MODE_RATE & PIT_BCD_MODE);
outb(PIT_COMMAND_PORT, PIT_CHANNEL_0 | PIT_ACCESS_MODE_LH | PIT_OP_MODE_RATE);
outb(PIT_DATA_PORT_CH0, PIT_FREQUENCY & 0xFF); /* send low byte */
outb(PIT_DATA_PORT_CH0, (PIT_FREQUENCY & 0xFF00) >> 8); /* send high byte */
configure_isa_irq(PIT_IRQ, PIT_IRQ0_OFFSET, IOAPIC_DEST_MODE_PHYSICAL, dst_cpus);
Expand Down
20 changes: 10 additions & 10 deletions include/drivers/pit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@
#define PIT_DATA_PORT_CH0 0x40
#define PIT_COMMAND_PORT 0x43

#define PIT_CHANNEL_0 (~((1 << 7) | (1 << 6)))
#define PIT_CHANNEL_0 0
#define PIT_ACCESS_MODE_LOW (1 << 4)
#define PIT_ACCESS_MODE_HIGH (1 << 5)
#define PIT_ACCESS_MODE_LH (PIT_ACCESS_MODE_LOW | PIT_ACCESS_MODE_HIGH)

enum pit_operational_mode {
PIT_OP_MODE_COUNT = 0x00, /* interrupt on terminal count */
PIT_OP_MODE_ONE_SHOT = 0x01, /* hardware re-triggerable one-shot */
PIT_OP_MODE_RATE = 0x02, /* rate generator */
PIT_OP_MODE_WAVE = 0x03, /* square wave generator */
PIT_OP_MODE_SW_STROBE = 0x04, /* software triggered strobe */
PIT_OP_MODE_HW_STROBE = 0x05, /* hardware triggered strobe */
PIT_OP_MODE_RATE_6 = 0x06, /* rate generator */
PIT_OP_MODE_WAVE_7 = 0x07 /* square wave generator */
PIT_OP_MODE_COUNT = 0x00 << 1, /* interrupt on terminal count */
PIT_OP_MODE_ONE_SHOT = 0x01 << 1, /* hardware re-triggerable one-shot */
PIT_OP_MODE_RATE = 0x02 << 1, /* rate generator */
PIT_OP_MODE_WAVE = 0x03 << 1, /* square wave generator */
PIT_OP_MODE_SW_STROBE = 0x04 << 1, /* software triggered strobe */
PIT_OP_MODE_HW_STROBE = 0x05 << 1, /* hardware triggered strobe */
PIT_OP_MODE_RATE_6 = 0x06 << 1, /* rate generator */
PIT_OP_MODE_WAVE_7 = 0x07 << 1 /* square wave generator */
};
typedef enum pit_operational_mode pit_operational_mode_t;

#define PIT_BCD_MODE (~(1 << 0))
#define PIT_BCD_MODE 1

extern void init_pit(uint8_t dst_cpus);
extern void pit_disable(void);
Expand Down