[PATCH v2] Add davbus and sound nodes
by John Arbuckle
Adds the davbus and sound nodes like this: mac-io/davbus/sound
This enables audio playback for a Mac OS 9 and a Mac OS X guest.
To test sound playback go to the sound node: cd mac-io/davbus/sound
Then type: test-sound
This will play some tones.
Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com>
---
v2 changes:
- Added sound test feature.
config/examples/ppc_config.xml | 1 +
drivers/build.xml | 1 +
drivers/macio.c | 2 +
drivers/pci.c | 4 +
drivers/screamer.c | 636 +++++++++++++++++++++++++++++++++++++++++
drivers/screamer.h | 11 +
6 files changed, 655 insertions(+)
create mode 100755 drivers/screamer.c
create mode 100644 drivers/screamer.h
diff --git a/config/examples/ppc_config.xml b/config/examples/ppc_config.xml
index 19dc043..908d497 100644
--- a/config/examples/ppc_config.xml
+++ b/config/examples/ppc_config.xml
@@ -84,5 +84,6 @@
<option name="CONFIG_DRIVER_USB" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_USB" type="boolean" value="false"/>
<option name="CONFIG_USB_HID" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_SCREAMER" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_LSI_53C810" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_VIRTIO_BLK" type="boolean" value="true"/>
diff --git a/drivers/build.xml b/drivers/build.xml
index 5a28bc2..575ac6a 100644
--- a/drivers/build.xml
+++ b/drivers/build.xml
@@ -22,6 +22,7 @@
<object source="pc_kbd.c" condition="DRIVER_PC_KBD"/>
<object source="pc_serial.c" condition="DRIVER_PC_SERIAL"/>
<object source="escc.c" condition="DRIVER_ESCC"/>
+ <object source="screamer.c" condition="DRIVER_SCREAMER"/>
<object source="fw_cfg.c" condition="DRIVER_FW_CFG"/>
<object source="usb.c" condition="DRIVER_USB"/>
<object source="usbhid.c" condition="USB_HID"/>
diff --git a/drivers/macio.c b/drivers/macio.c
index 496bab1..0f95705 100644
--- a/drivers/macio.c
+++ b/drivers/macio.c
@@ -21,6 +21,7 @@
#include "pmu.h"
#include "escc.h"
#include "drivers/pci.h"
+#include "screamer.h"
#define OW_IO_NVRAM_SIZE 0x00020000
#define OW_IO_NVRAM_OFFSET 0x00060000
@@ -391,6 +392,7 @@ ob_macio_keylargo_init(const char *path, phys_addr_t addr)
escc_init(path, addr);
macio_ide_init(path, addr, 2);
openpic_init(path, addr);
+ screamer_init(addr);
aliases = find_dev("/aliases");
set_property(aliases, "mac-io", path, strlen(path) + 1);
diff --git a/drivers/pci.c b/drivers/pci.c
index 9d501d3..b607fa5 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -1978,6 +1978,10 @@ static phandle_t ob_pci_host_set_interrupt_map(phandle_t host)
target_node = find_dev(path);
set_int_property(target_node, "interrupt-parent", dnode);
+ snprintf(buf, sizeof(buf), "%s/mac-io/davbus", path);
+ target_node = find_dev(buf);
+ set_int_property(target_node, "interrupt-parent", dnode);
+
return dnode;
}
diff --git a/drivers/screamer.c b/drivers/screamer.c
new file mode 100755
index 0000000..b9fced1
--- /dev/null
+++ b/drivers/screamer.c
@@ -0,0 +1,636 @@
+// File: screamer.c
+// Description: Implements the davbus and sound nodes for sound support.
+
+#include "screamer.h"
+#include "asm/types.h"
+#include "kernel/stack.h"
+#include "libopenbios/bindings.h"
+#include <stddef.h>
+#include <stdbool.h>
+#include "libc/vsprintf.h"
+#include "libc/stdlib.h"
+#include "timer.h"
+#include "libopenbios/ofmem.h"
+
+uint32_t screamer_base_address = 0;
+uint32_t dma_base_address = 0;
+uint32_t chip_freq = 8820;
+int *sample_array = NULL;
+int buffer_size = 0;
+int append_index = 0;
+int packet_size = 8000;
+
+#define DEAD 0x0800
+#define RUN 0x8000
+
+#define DEBUG 0
+#define debug_print(fmt, ...) do { \
+if (DEBUG) { \
+ printk(fmt, ## __VA_ARGS__); \
+} \
+} while (0)
+
+/* Prints to the console */
+static int print(const char *fmt, ...)
+{
+ va_list args;
+ int i;
+ char buf[100];
+ va_start(args, fmt);
+ i=vsprintf(buf,fmt,args);
+ va_end(args);
+ push_str(buf);
+ fword("type");
+ return i;
+}
+
+
+/* Makes the screen blank and places the cursor in the upper left corner */
+static void clear_screen(void)
+{
+ int i;
+
+ // clears the screen
+ for (i = 0; i < 100; i++) {
+ print("\n");
+ }
+
+ // makes cursor go back to the top left corner
+ for (i = 0; i < 100; i++) {
+ print("%c", 11);
+ }
+}
+
+
+/* Centers and prints a message on the screen */
+static void print_center(const char *message)
+{
+ int message_length = strlen(message);
+ int screen_width = 96;
+ int padding = (screen_width - message_length) / 2;
+ if (padding < 0) {
+ padding = 0;
+ }
+ char output_string[81];
+ memset(output_string, ' ', padding);
+ sprintf(output_string + padding, "%s", message);
+ print(output_string);
+}
+
+
+/* Writes a 32 bit value to the specified register in Screamer */
+static void write_screamer(int reg, uint32_t value)
+{
+ reg = reg << 4;
+ *(volatile uint32_t *)(screamer_base_address + reg) = value;
+ asm volatile("eieio" : : : "memory");
+}
+
+
+/* Set sampling rate to 8820 Hz */
+static void set_sampling_rate(void)
+{
+ write_screamer(0, 0x60000);
+}
+
+
+/* Sets the volume to the maximum value */
+static void set_volume(void)
+{
+ write_screamer(1, 0x400000);
+}
+
+
+/* Clears the audio buffer */
+static void clear_buffer(void)
+{
+ memset(sample_array, 0, buffer_size);
+ append_index = 0;
+}
+
+
+/* Initializes the tone playing system */
+static void initialize(void)
+{
+ static bool is_initialized = false;
+
+ /* Only need to do this once */
+ if (is_initialized) {
+ return;
+ }
+
+ /* Allocate memory for audio buffer */
+ int i, status, current_size = 2000000; /* Start big and work our way down */
+ for (i = 0; i < current_size; i++) {
+ status = ofmem_posix_memalign((void *)&sample_array, 32, sizeof(int) *
+ current_size);
+ if (status == 0) {
+ break;
+ }
+ current_size = current_size / 2;
+ }
+ if (!sample_array) {
+ print("Failed to allocate memory for samples!\n");
+ return;
+ } else {
+ debug_print("buffer size: %d\n", current_size);
+ }
+ set_sampling_rate();
+ set_volume();
+ is_initialized = true;
+ buffer_size = current_size;
+ clear_buffer();
+}
+
+
+/* Converts a big endian 16 bit value to little endian */
+static uint16_t convert2le16(uint16_t value)
+{
+ uint16_t byte1, byte2;
+ byte1 = (value & 0xff) << 8u;
+ byte2 = (value & 0xff00) >> 8u;
+ value = byte1 | byte2;
+ return value;
+}
+
+/* Converts a big endian 32 bit value to little endian */
+static uint32_t convert2le32(uint32_t value)
+{
+ uint32_t byte1, byte2, byte3, byte4;
+ byte1 = (value & 0xff) << 24u;
+ byte2 = (value & 0xff00) << 8u;
+ byte3 = (value & 0xff0000) >> 8u;
+ byte4 = (value & 0xff000000) >> 24u;
+ value = byte1 | byte2 | byte3 | byte4;
+ return value;
+}
+
+/* Read a register's value for channel 16 */
+static uint32_t read_dma(int reg)
+{
+ int channel = 16; // Screamer's output channel
+ uint32_t addr, return_value;
+ addr = channel << 7; // set channel
+ addr |= (4*reg); // set register
+ asm volatile("eieio" : : : "memory");
+ return_value = *(volatile uint32_t *)(dma_base_address + addr);
+ return_value = return_value >> 8;
+ return return_value;
+}
+
+/* Tell the dbdma the value to set for the register for channel 16 */
+static void write_dma(int reg, uint32_t value)
+{
+ int channel = 16; // Screamer's output channel
+ uint32_t addr;
+ addr = channel << 7; // set channel
+ addr |= (4*reg); // et register
+ value = convert2le32(value); // DMA controller uses little endian
+ *(volatile uint32_t *)(dma_base_address + addr) = value;
+ asm volatile("eieio" : : : "memory");
+}
+
+
+/* Programs the DMA controller to send our samples to Screamer */
+static void send_samples_to_dma(int offset)
+{
+ typedef struct dbdma_cmd {
+ uint16_t req_count; /* length of data */
+ uint16_t command; /* tells the dma what to do */
+ uint32_t phy_addr; /* address of the sample buffer */
+ uint32_t cmd_dep; /* command-dependent field - not used */
+ uint16_t res_count; /* not used */
+ uint16_t xfer_status; /* transfer status - not used */
+ } dbdma_cmd;
+
+ int num_of_descriptors;
+ if (packet_size > append_index) {
+ num_of_descriptors = 1;
+ } else {
+ num_of_descriptors = append_index/packet_size;
+ }
+ dbdma_cmd *descriptor_array;
+
+ /* DMA expects 16 bit alignment */
+ if (ofmem_posix_memalign((void *)&descriptor_array, 16, sizeof(dbdma_cmd) *
+ num_of_descriptors)) {
+ print("Error: failed to allocate memory for dbdma command!\n");
+ return;
+ }
+
+ /* === Initialize the descriptors === */
+ int i;
+ for (i = 0; i < num_of_descriptors; i++) {
+
+ /* Set the length of the data */
+ descriptor_array[i].req_count = convert2le16(packet_size);
+
+ if (i == (num_of_descriptors - 1)) {
+ /*
+ * Don't branch & OUTPUT_LAST & KEY_STREAM0 & interrupt never &
+ * wait never
+ */
+ descriptor_array[i].command = convert2le16(0x1000);
+ } else {
+ /*
+ * Don't branch & OUTPUT_MORE & KEY_STREAM0 & interrupt never &
+ * wait never
+ */
+ descriptor_array[i].command = 0;
+ }
+
+ /* Set the address of the buffer used to feed Screamer samples */
+ descriptor_array[i].phy_addr = convert2le32(sample_array +
+ (packet_size * i));
+ }
+ /* send the above structure to the DMA for parsing */
+ write_dma(3, descriptor_array);
+
+ /*
+ * Disables branch select feature - makes dma load another descriptor
+ * automatically using an array of descriptors. The branch() and next()
+ * functions of the DMA both load the next descriptor. The only difference
+ * is which variable it is loaded from. The dma's next() function seems
+ * easier to use because it simply expects an array of descriptors. The
+ * branch function would want a linked list of descriptors.
+ */
+ write_dma(5, 0);
+
+ /* Set to disable interrupts because we use polling instead */
+ write_dma(4, 0);
+
+ /*
+ * Sets the upper 32 bits of the address to zero since the CPU is only 32
+ * bits.
+ */
+ write_dma(2, 0);
+
+ /* Disable flushing so audio plays back correctly */
+ write_dma(1, 0);
+
+ /* Calls control write function - starts the whole DMA process */
+ write_dma(0, 0x84008400);
+}
+
+
+/* Adds samples to a buffer */
+static int append(int value)
+{
+ if (append_index >= buffer_size) {
+ print("Can't append to buffer - out of space\n");
+ return -1;
+ }
+ sample_array[append_index] = value;
+ append_index++;
+ return 0;
+}
+
+
+/* Creates a sample */
+static int get_sample(bool is_even)
+{
+ if (is_even) {
+ return 1;
+ } else {
+ return -1;
+ }
+}
+
+
+/* Delays execution by specified milliseconds */
+static void sleep(int milliseconds)
+{
+ mdelay(milliseconds);
+}
+
+
+/* Blocks execution while the dma plays the samples */
+static void play_samples(void)
+{
+ int i, iterations, offset;
+ uint32_t status;
+
+ /* Nothing to do */
+ if (append_index == 0) {
+ return;
+ }
+
+ if (packet_size > append_index) {
+ iterations = 1;
+ } else {
+ iterations = append_index/packet_size;
+ }
+
+ send_samples_to_dma(0);
+ for(i = 0; i < iterations; i++)
+ {
+ offset = i * packet_size;
+ status = read_dma(1);
+ debug_print("dma status: 0x%x\n", status);
+ while ((status & RUN) && !(status & DEAD)) {
+ debug_print("Still waiting - dma status: 0x%x\n", status);
+ sleep(10);
+ status = read_dma(1);
+ }
+
+ if (status & DEAD) {
+ debug_print("dma status is dead\n");
+ break;
+ }
+ }
+}
+
+
+/*
+ * Plays a note of a specified frequency and duration.
+ * Returns the number of samples added to the buffer.
+ * note_freq: in Hertz
+ * duration: in milliseconds
+ */
+static void play_note(uint32_t note_freq, int duration)
+{
+ // makes audio play for the correct duration
+ duration = duration * 2;
+
+ if (note_freq <= 0 || duration <= 0) {
+ print("Error: note frequency and duration must be greater than zero\n");
+ return;
+ }
+ int samples_between_changes = chip_freq/note_freq;
+ debug_print("chip_freq: %d\tnote_freq: %d\n", chip_freq, note_freq);
+ debug_print("samples between changes: %d\n", samples_between_changes);
+ int amplitude = 25000;
+ int iterations = (chip_freq * duration) / (samples_between_changes * 1000);
+ debug_print("iterations: %d\n", iterations);
+ int i, sample;
+ for (i = 0; i < iterations; i++) {
+ int s;
+ for (s = 0; s < samples_between_changes; s++) {
+ sample = get_sample(i % 2 == 0);
+ sample = sample * amplitude;
+ if (append(sample) != 0) { // if buffer is full
+ debug_print("Sending samples to screamer...\n");
+
+ /* Try to fix the problem with breaking up audio samples for the DMA */
+ append_index = append_index - s;
+ s = 0;
+
+ play_samples();
+ clear_buffer();
+ if (append(sample) != 0) {
+ print("Error: failure to add sample!\n");
+ }
+ }
+ }
+ }
+ play_samples();
+ clear_buffer();
+}
+
+
+/*
+ * Implements the Forth play-note word.
+ * ( frequency duration(in ms) - )
+ */
+ static void forth_play_note(void)
+ {
+ uint32_t note_freq, duration;
+ duration = POP();
+ note_freq = POP();
+ initialize();
+ clear_buffer();
+ play_note(note_freq, duration);
+ }
+
+
+/*
+ * Adds silence to the output.
+ * Returns the number of samples added to the buffer.
+ * duration: in milliseconds
+ */
+static void silence(int duration)
+{
+ // This make the correct amount of samples
+ duration = duration * 2;
+
+ int number_of_samples = chip_freq * duration / 1000;
+ debug_print("silence samples: %d\n", number_of_samples);
+ int i;
+ for (i = 0; i < number_of_samples; i++) {
+ if (append(0) != 0) {
+ play_samples();
+ clear_buffer();
+ }
+ }
+}
+
+
+/*
+ * Implements the Forth silence word.
+ * ( duration - )
+ */
+static void forth_silence(void)
+{
+ initialize();
+ int duration = POP();
+ silence(duration);
+}
+
+
+/* Creates a little song */
+static void create_samples(void)
+{
+ int i;
+ for (i = 0; i < 3; i++) {
+ play_note(400, 500);
+ play_note(600, 500);
+ play_note(800, 500);
+ play_note(1000, 500);
+ play_note(1200, 500);
+ silence(300);
+ }
+
+ play_note(400, 400);
+ silence(50);
+ play_note(400, 400);
+ silence(50);
+ play_note(800, 400);
+ silence(50);
+ play_note(800, 400);
+ silence(50);
+ play_note(900, 400);
+ silence(50);
+ play_note(900, 400);
+ silence(50);
+ play_note(800, 400);
+}
+
+
+/* Lets the user know the sound test is complete */
+static void end_test(void)
+{
+ clear_screen();
+ print_center("Testing Sound");
+ print("\n\n");
+ print_center("Done\n\n");
+ sleep(700);
+}
+
+
+/* Tells user testing has begun and creates and plays samples */
+static void play_sound(void)
+{
+ clear_screen();
+ print_center("Testing Sound");
+ print("\n\n");
+ print_center("Now playing...");
+ create_samples();
+ play_samples();
+}
+
+
+/* Displays a countdown informing the user testing is about to begin */
+static void display_countdown(void)
+{
+ clear_screen();
+ print_center("Testing Sound");
+ print("\n");
+ sleep(500);
+ print_center("3\n");
+ sleep(500);
+ print_center("2\n");
+ sleep(500);
+ print_center("1\n");
+ sleep(500);
+ print_center("0\n");
+ sleep(500);
+}
+
+
+/* Starts the sound test */
+static void test_sound(void)
+{
+ initialize();
+ display_countdown();
+ play_sound();
+ end_test();
+}
+
+
+/* Makes sound related functions available in Forth */
+static void add_words(phys_addr_t base_address)
+{
+ screamer_base_address = base_address + 0x14000;
+ dma_base_address = 0x80008000;
+
+ bind_func("test-sound", test_sound);
+ bind_func("play-note", forth_play_note);
+ bind_func("silence", forth_silence);
+}
+
+
+/* Add the sound node for the screamer sound chip */
+static void setup_screamer_node(phys_addr_t base_address)
+{
+ phandle_t node;
+
+ fword("new-device");
+ push_str("sound");
+ fword("device-name");
+
+ push_str("screamer");
+ fword("encode-string");
+ push_str("awacs");
+ fword("encode-string");
+ fword("encode+");
+ push_str("compatible");
+ fword("property");
+
+ push_str("343S0184");
+ fword("encode-string");
+ push_str("model");
+ fword("property");
+
+ node = get_cur_dev();
+
+ set_int_property(node, "#-outputs", 1);
+ set_int_property(node, "#-detects", 3);
+ set_int_property(node, "#-features", 3);
+ set_int_property(node, "object-model-version", 1);
+ set_int_property(node, "device-id", 5);
+
+ char *value = "init operation 2 param 00000001 param-size 4\0"
+ "feature index 0 model Proj7PowerControl\0"
+ "feature index 1 model USBSubwoofer\0"
+ "feature index 2 model NotifySSprockets\0"
+ "detect bit-mask 2 bit-match 2 device 2 index 0 model InSenseBitsDetect\0"
+ "detect bit-mask 4 bit-match 4 device 16 index 1 model InSenseBitsDetect\0"
+ "detect bit-mask 1 bit-match 0 device 32 index 2 model InSenseBitsDetect\0"
+ "input icon-id -16526 index 0 name-id -20520 port-connection 2 "
+ "port-type 0x656D6963 zero-gain 0 model ExternalMic\0"
+ "input icon-id -16526 index 1 name-id -20528 port-connection 2 "
+ "port-type 0x73696E6A zero-gain 0 model InputPort\0"
+ "input icon-id -20184 index 2 name-id -20540 port-connection 3 "
+ "port-type 0x6d6f646d zero-gain 0 model InputPort\0"
+ "input index 3 model NoInput\0"
+ "output device-mask 2 device-match 0 icon-id -16563 index 0 name-id -20525"
+ " port-connection 2 port-type 0x6973706B model OutputPort\0"
+ "output device-mask 2 device-match 2 icon-id -16563 index 1 name-id -20524"
+ " port-connection 1 port-type 0x6864706E model OutputPort\0";
+
+ set_property(node, "sound-objects", value, 996);
+ add_words(base_address);
+ fword("finish-device");
+}
+
+
+/* Add the davbus node */
+static void setup_davbus_node(phys_addr_t base_address)
+{
+ phandle_t node;
+ fword("new-device");
+
+ push_str("davbus");
+ fword("device-name");
+
+ push_str("soundbus");
+ fword("encode-string");
+ push_str("device_type");
+ fword("property");
+
+ push_str("davbus");
+ fword("encode-string");
+ push_str("compatible");
+ fword("property");
+
+ node = get_cur_dev();
+ int properties[6];
+
+ /* reg property */
+ properties[0] = 0x14000;
+ properties[1] = 0x1000;
+ properties[2] = 0x8800;
+ properties[3] = 0x100;
+ properties[4] = 0x8900;
+ properties[5] = 0x100;
+ set_property(node, "reg", (char *)properties, sizeof(int) * 6);
+
+ /* interrupt property */
+ properties[0] = 0x18;
+ properties[1] = 1;
+ properties[2] = 9;
+ properties[3] = 0;
+ properties[4] = 0xa;
+ properties[5] = 0;
+ set_property(node, "interrupts", (char *)properties, sizeof(int) * 6);
+
+ setup_screamer_node(base_address);
+
+ fword("finish-device");
+}
+
+
+void screamer_init(phys_addr_t base_address)
+{
+ setup_davbus_node(base_address);
+}
diff --git a/drivers/screamer.h b/drivers/screamer.h
new file mode 100644
index 0000000..64d9443
--- /dev/null
+++ b/drivers/screamer.h
@@ -0,0 +1,11 @@
+// File: screamer.h
+// Description: header file for screamer.c
+
+#ifndef screamer_h
+#define screamer_h
+
+#include "drivers/drivers.h"
+
+void screamer_init(phys_addr_t base_address);
+
+#endif /* screamer_h */
--
2.14.3 (Apple Git-98)
3 weeks, 3 days
- 1
- 0
[PATCH] Add davbus and sound nodes
by John Arbuckle
Adds the davbus and sound nodes like this: mac-io/davbus/sound
This enables audio playback for a Mac OS 9 and a Mac OS X guest.
Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com>
---
config/examples/ppc_config.xml | 1 +
drivers/build.xml | 1 +
drivers/macio.c | 2 +
drivers/pci.c | 4 ++
drivers/screamer.c | 112 +++++++++++++++++++++++++++++++++++++++++
drivers/screamer.h | 9 ++++
6 files changed, 129 insertions(+)
create mode 100644 drivers/screamer.c
create mode 100644 drivers/screamer.h
diff --git a/config/examples/ppc_config.xml b/config/examples/ppc_config.xml
index 19dc043..908d497 100644
--- a/config/examples/ppc_config.xml
+++ b/config/examples/ppc_config.xml
@@ -84,5 +84,6 @@
<option name="CONFIG_DRIVER_USB" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_USB" type="boolean" value="false"/>
<option name="CONFIG_USB_HID" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_SCREAMER" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_LSI_53C810" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_VIRTIO_BLK" type="boolean" value="true"/>
diff --git a/drivers/build.xml b/drivers/build.xml
index 5a28bc2..575ac6a 100644
--- a/drivers/build.xml
+++ b/drivers/build.xml
@@ -22,6 +22,7 @@
<object source="pc_kbd.c" condition="DRIVER_PC_KBD"/>
<object source="pc_serial.c" condition="DRIVER_PC_SERIAL"/>
<object source="escc.c" condition="DRIVER_ESCC"/>
+ <object source="screamer.c" condition="DRIVER_SCREAMER"/>
<object source="fw_cfg.c" condition="DRIVER_FW_CFG"/>
<object source="usb.c" condition="DRIVER_USB"/>
<object source="usbhid.c" condition="USB_HID"/>
diff --git a/drivers/macio.c b/drivers/macio.c
index 496bab1..15c74ac 100644
--- a/drivers/macio.c
+++ b/drivers/macio.c
@@ -21,6 +21,7 @@
#include "pmu.h"
#include "escc.h"
#include "drivers/pci.h"
+#include "screamer.h"
#define OW_IO_NVRAM_SIZE 0x00020000
#define OW_IO_NVRAM_OFFSET 0x00060000
@@ -391,6 +392,7 @@ ob_macio_keylargo_init(const char *path, phys_addr_t addr)
escc_init(path, addr);
macio_ide_init(path, addr, 2);
openpic_init(path, addr);
+ screamer_init();
aliases = find_dev("/aliases");
set_property(aliases, "mac-io", path, strlen(path) + 1);
diff --git a/drivers/pci.c b/drivers/pci.c
index 9d501d3..b607fa5 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -1978,6 +1978,10 @@ static phandle_t ob_pci_host_set_interrupt_map(phandle_t host)
target_node = find_dev(path);
set_int_property(target_node, "interrupt-parent", dnode);
+ snprintf(buf, sizeof(buf), "%s/mac-io/davbus", path);
+ target_node = find_dev(buf);
+ set_int_property(target_node, "interrupt-parent", dnode);
+
return dnode;
}
diff --git a/drivers/screamer.c b/drivers/screamer.c
new file mode 100644
index 0000000..e494caa
--- /dev/null
+++ b/drivers/screamer.c
@@ -0,0 +1,112 @@
+// File: screamer.c
+// Description: Implements the davbus and sound nodes for sound support.
+
+#include "screamer.h"
+#include "asm/types.h"
+#include "kernel/stack.h"
+#include "libopenbios/bindings.h"
+
+
+/* Add the sound node for the screamer sound chip */
+static void setup_screamer_node()
+{
+ phandle_t node;
+
+ fword("new-device");
+ push_str("sound");
+ fword("device-name");
+
+ push_str("screamer");
+ fword("encode-string");
+ push_str("awacs");
+ fword("encode-string");
+ fword("encode+");
+ push_str("compatible");
+ fword("property");
+
+ push_str("343S0184");
+ fword("encode-string");
+ push_str("model");
+ fword("property");
+
+ node = get_cur_dev();
+
+ set_int_property(node, "#-outputs", 1);
+ set_int_property(node, "#-detects", 3);
+ set_int_property(node, "#-features", 3);
+ set_int_property(node, "object-model-version", 1);
+ set_int_property(node, "device-id", 5);
+
+ char *value = "init operation 2 param 00000001 param-size 4\0"
+ "feature index 0 model Proj7PowerControl\0"
+ "feature index 1 model USBSubwoofer\0"
+ "feature index 2 model NotifySSprockets\0"
+ "detect bit-mask 2 bit-match 2 device 2 index 0 model InSenseBitsDetect\0"
+ "detect bit-mask 4 bit-match 4 device 16 index 1 model InSenseBitsDetect\0"
+ "detect bit-mask 1 bit-match 0 device 32 index 2 model InSenseBitsDetect\0"
+ "input icon-id -16526 index 0 name-id -20520 port-connection 2 "
+ "port-type 0x656D6963 zero-gain 0 model ExternalMic\0"
+ "input icon-id -16526 index 1 name-id -20528 port-connection 2 "
+ "port-type 0x73696E6A zero-gain 0 model InputPort\0"
+ "input icon-id -20184 index 2 name-id -20540 port-connection 3 "
+ "port-type 0x6d6f646d zero-gain 0 model InputPort\0"
+ "input index 3 model NoInput\0"
+ "output device-mask 2 device-match 0 icon-id -16563 index 0 name-id -20525"
+ " port-connection 2 port-type 0x6973706B model OutputPort\0"
+ "output device-mask 2 device-match 2 icon-id -16563 index 1 name-id -20524"
+ " port-connection 1 port-type 0x6864706E model OutputPort\0";
+
+ set_property(node, "sound-objects", value, 996);
+
+ fword("finish-device");
+}
+
+/* Add the davbus node */
+static void setup_davbus_node()
+{
+ phandle_t node;
+ fword("new-device");
+
+ push_str("davbus");
+ fword("device-name");
+
+ push_str("soundbus");
+ fword("encode-string");
+ push_str("device_type");
+ fword("property");
+
+ push_str("davbus");
+ fword("encode-string");
+ push_str("compatible");
+ fword("property");
+
+ node = get_cur_dev();
+ int properties[6];
+
+ /* reg property */
+ properties[0] = 0x14000;
+ properties[1] = 0x1000;
+ properties[2] = 0x8800;
+ properties[3] = 0x100;
+ properties[4] = 0x8900;
+ properties[5] = 0x100;
+ set_property(node, "reg", (char *)properties, sizeof(int) * 6);
+
+ /* interrupt property */
+ properties[0] = 0x18;
+ properties[1] = 1;
+ properties[2] = 9;
+ properties[3] = 0;
+ properties[4] = 0xa;
+ properties[5] = 0;
+ set_property(node, "interrupts", (char *)properties, sizeof(int) * 6);
+
+ setup_screamer_node();
+
+ fword("finish-device");
+}
+
+void screamer_init()
+{
+ setup_davbus_node();
+}
diff --git a/drivers/screamer.h b/drivers/screamer.h
new file mode 100644
index 0000000..76624c0
--- /dev/null
+++ b/drivers/screamer.h
@@ -0,0 +1,9 @@
+// File: screamer.h
+// Description: header file for screamer.c
+
+#ifndef screamer_h
+#define screamer_h
+
+void screamer_init();
+
+#endif /* screamer_h */
--
2.14.3 (Apple Git-98)
1 month
- 1
- 0
building openbios sparc64 for qemu
by berrie.schuurhuis＠gmail.com
As a newbee in this space I got qemu-system-sparc[64] running on a linux machine.
Trying to find out how qemu and openbios work together I'm currently looking into building openbios-sparc64.
This goes with mixed success as https://www.openfirmware.info/OpenBIOS has nice description on how to build openbios, but there's a missing link as to how to harvest the openbios-sparc64 from this.
My build of openbios is done on an Ultra60(Sparc) machine that runs:
Linux ultra60 4.19.0-2-sparc64 #1 Debian 4.19.16-1 (2019-01-17) sparc64 GNU/Linux
with gcc --version
gcc (Debian 8.3.0-2) 8.3.0
It seems like the file openbios/obj-sparc64/openbios-builtin.elf may be the candidate to become openbios-sparc64??
When giving this a try, and moving openbios-builtin.elf to my x86 qemu machine, it crashes spectacularly with:
qemu: fatal: Trap 0x0064 while trap level (5) >= MAXTL (5), Error state
pc: 0000000000004c80 npc: 0000000000004c84
%g0-3: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%g4-7: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%o0-3: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%o4-7: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%l0-3: 00000000fff001e0 000001ff00000000 000001fff0080000 0000000000000000
%l4-7: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%i0-3: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%i4-7: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f00: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f08: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f24: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f32: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f40: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f48: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f56: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
pstate: 00000414 ccr: 44 (icc: -Z-- xcc: -Z--) asi: 00 tl: 5 pil: 0 gl: 2
tbr: 0000000000000000 hpstate: 0000000000000000 htba: 0000000000000000
cansave: 6 canrestore: 0 otherwin: 0 wstate: 0 cleanwin: 6 cwp: 7
fsr: 0000000000000000 y: 0000000000000000 fprs: 0000000000000000
On x86: Booting qemu with the provided openbios-sparc64 rom works flawless.
On the Ultra60: Running ./openbios-unix openbios-sparc64.dict seems to behave as expected:
Output device screen not found.
Input device keyboard not found.
Output device screen not found.
Type 'help' for detailed information
[unix] Booting default not supported.
Trying disk...
No valid state has been set by load or init-program
0 > help
To get openbios build, I had to make a small change in Makefile.target:
#CFLAGS+= -Werror
CFLAGS+= -Wno-error
To "fix":
Building OpenBIOS for sparc64
Building...
/usr/bin/xsltproc
error:
CC target/arch/unix/unix.o
CC target/arch/unix/boot.o
/sources/openbios/arch/unix/boot.c:101:6: error: redundant redeclaration of 'forth_fw_cfg_read_file' [-Werror=redundant-decls]
void forth_fw_cfg_read_file(void);
^~~~~~~~~~~~~~~~~~~~~~
In file included from ./target/include/asm/io.h:8,
from /sources/openbios/include/kernel/kernel.h:22,
from /sources/openbios/include/libopenbios/bindings.h:21,
from /sources/openbios/arch/unix/boot.c:6:
/sources/openbios/include/arch/common/fw_cfg.h:104:6: note: previous declaration of 'forth_fw_cfg_read_file' was here
void forth_fw_cfg_read_file(void);
^~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Any pointers or suggestions to continue this journey are appreciated.
1 month, 2 weeks
- 5
- 8
Any known BIOS for Fujitsu LifeBook E744?
by fraczakmarek18＠gmail.com
Hello,
I am searching for BIOS for the above mentioned Fujitsu.
Best regards,
M. Fraczek
Scrascom Sp. z o.o.
https://scrascom.pl
1 month, 3 weeks
- 1
- 0
cbse schools near marathahalli
by foundationschoolindia＠gmail.com
Best CBSE Schools in Whitefield & Varthur: The Foundation Schools in Whitefield has created a name for itself through its excellence in education. The school has good connectivity to Varthur, Sarjapur road, Whitefield and Marathalli.
https://www.foundationschoolindia.com/
2 months, 1 week
- 1
- 0
Wireless Network Technician
by ashaikfe＠gmail.com
Wireless Network Technicians are responsible for resolving mediation applications and systems. A Network Technician must provide first- and second-tier production support relating to data mediation applications and servers. They must research, identify and resolve support tickets, system alarms, and production issues according to severity. The professional has to implement suitable and appropriate responses quickly and effectively.
Read More: https://www.fieldengineer.com/skills/wireless-network-technician
2 months, 2 weeks
- 1
- 0
[PATCH 0/2] ide: remove global channels list
by Mark Cave-Ayland
Here are another couple of patches which convert the IDE channel and drive
pointers into instance variables, allowing the global IDE channels list to
be removed.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Mark Cave-Ayland (2):
ide: use instance values to hold C drive and channel structures
ide: locate drives by iterating over the device tree during
ob_ide_quiesce()
drivers/ide.c | 71 +++++++++++++++++----------------------------------
drivers/ide.h | 1 -
2 files changed, 23 insertions(+), 49 deletions(-)
--
2.20.1
2 months, 3 weeks
- 1
- 3
[PATCH] escc: explicitly mark variable containing incoming keyboard character as volatile
by Mark Cave-Ayland
Otherwise the compiler may not understand that a read from the assigned buffer
is comming from memory-mapped IO space and fail to update accordingly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
drivers/escc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/escc.c b/drivers/escc.c
index 392625e..d9e1990 100644
--- a/drivers/escc.c
+++ b/drivers/escc.c
@@ -284,7 +284,7 @@ keyboard_dataready(void)
unsigned char
keyboard_readdata(void)
{
- unsigned char ch;
+ volatile unsigned char ch;
while (!keyboard_dataready()) { }
--
2.20.1
2 months, 3 weeks
- 2
- 7
[PATCH] Implement missing words for the ATI FCode ROM to test ati-vga emulation
by BALATON Zoltan
Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu>
---
drivers/pci.c | 51 +++++++++++++++++++++++++++++++++++++--------------
drivers/pci.fs | 41 +++++++++++++++++++++++++++++++++++++++++
drivers/vga.fs | 4 ++--
forth/device/other.fs | 6 ++++++
4 files changed, 86 insertions(+), 16 deletions(-)
This is on top of Mark's previous patches from the openbios mailing
list applied to openbios master:
9a32ed9 Implement missing words for the ATI FCode ROM to test ati-vga emulation
b90ac41 virtio: use instance value to initialise C instance parameter
ac467a3 lsi: use instance value to hold sd_private_t pointer
177684a pc_kbd: use instance value to initialise C instance parameter
d5fdb98 pc_serial: remove separate init word
7c20840 pci: call set-args before configuring PCI device nodes
f37460e pci: remove explicit setting of my-self from PCI devices
b548924 pci: remove explicit find-device from PCI devices
b1ca78f x86: set active package and current instance to root device node before probe
6222a47 SPARC64: set active package and current instance to root device node before probe
5cd41e5 ppc: set active package and current instance to root device node before probe
e68504f ppc: move New World uninorth and nvram device node creation to the root device
86aa740 nvram: ensure that NVRAM configuration is separate from NVRAM node creation
e959bfd libopenbios: remove REGISTER_NAMED_NODE and REGISTER_NAMED_NODE_PHANDLE macros
abc4553 pci: remove ob_pci_initialize() and ob_pci_empty_node
0a63c74 pci: convert to use BIND_NODE_METHODS() macro
57ff6ea virtio: convert to use BIND_NODE_METHODS() macro
ea3a8eb lsi: convert to use BIND_NODE_METHODS() macro
32ff529 lsi: don't change active package when setting device alias
f63f5ee nvram: convert to use BIND_NODE_METHODS() macro
03c53be usbhid: convert to use BIND_NODE_METHODS() macro
365b2c1 pmu: convert to use BIND_NODE_METHODS() macro
60125f5 macio: convert to use BIND_NODE_METHODS() macro
7d23b31 cuda: convert to use BIND_NODE_METHODS() macro
305d629 escc: convert to use BIND_NODE_METHODS() macro
4a0aea1 adb: convert to use BIND_NODE_METHODS() macro
0081f71 ide: convert to use BIND_NODE_METHODS() macro
79a241c floppy: convert to use BIND_NODE_METHODS() macro
01ea2e4 pc_serial: convert to use BIND_NODE_METHODS() macro
9eb09a9 pc_kbd: convert to use BIND_NODE_METHODS() macro
8945ab4 libopenbios: introduce BIND_NODE_METHODS() macro
e9491ea admin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses propertyadmin/devices.fs: Format assigned-addresses property
c79e0ec (origin/master, origin/HEAD) SPARC64: use serial console when QEMU is launched with -vga none
admin/devices.fs: Format assigned-addresses property is
https://mail.coreboot.org/hyperkitty/list/openbios@openbios.org/thread/WH...
and additionally to the above I also have another patch from Mark that
I can't find now in the list archives even though I remember I've replyed
to it and had a discussion about having 3 or 2 cases if-else statement.
diff --git a/drivers/pci.c b/drivers/pci.c
index 4bc02c9..eb5f7d3 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -408,20 +408,32 @@ static void ob_pci_unmap(ucell virt, ucell size) {
static void
ob_pci_bus_map_in(int *idx)
{
- uint32_t ba;
- ucell size;
- ucell virt;
-
- PCI_DPRINTF("ob_pci_bar_map_in idx=%p\n", idx);
+ fword("pci-map-in");
+}
- size = POP();
- POP();
- POP();
- ba = POP();
+static void
+ob_pci_bus_map_out(int *idx)
+{
+ /* Should call pci-map-out but nothing to do in it yet */
+ fword("2drop");
+}
- virt = ob_pci_map(ba, size);
+static void
+ob_pci_config_read8(int *idx)
+{
+ cell hi = POP();
+ pci_addr addr = PCI_ADDR(PCI_BUS(hi), PCI_DEV(hi), PCI_FN(hi));
+ uint8_t val = pci_config_read8(addr, hi & 0xff);
+ PUSH(val);
+}
- PUSH(virt);
+static void
+ob_pci_config_write8(int *idx)
+{
+ cell hi = POP();
+ pci_addr addr = PCI_ADDR(PCI_BUS(hi), PCI_DEV(hi), PCI_FN(hi));
+ cell val = POP();
+ pci_config_write8(addr, hi & 0xff, val & 0xff);
}
static void
@@ -459,7 +471,10 @@ NODE_METHODS(ob_pci_bus_node) = {
{ "close", ob_pci_close },
{ "decode-unit", ob_pci_decode_unit },
{ "encode-unit", ob_pci_encode_unit },
- { "pci-map-in", ob_pci_bus_map_in },
+ { "map-in", ob_pci_bus_map_in },
+ { "map-out", ob_pci_bus_map_out },
+ { "config-b@", ob_pci_config_read8 },
+ { "config-b!", ob_pci_config_write8 },
{ "dma-alloc", ob_pci_dma_alloc },
{ "dma-free", ob_pci_dma_free },
{ "dma-map-in", ob_pci_dma_map_in },
@@ -473,7 +488,14 @@ static void
ob_pci_bridge_map_in(int *idx)
{
/* As per the IEEE-1275 PCI specification, chain up to the parent */
- call_parent_method("pci-map-in");
+ call_parent_method("map-in");
+}
+
+static void
+ob_pci_bridge_map_out(int *idx)
+{
+ /* As per the IEEE-1275 PCI specification, chain up to the parent */
+ call_parent_method("map-out");
}
NODE_METHODS(ob_pci_bridge_node) = {
@@ -481,7 +503,8 @@ NODE_METHODS(ob_pci_bridge_node) = {
{ "close", ob_pci_close },
{ "decode-unit", ob_pci_decode_unit },
{ "encode-unit", ob_pci_encode_unit },
- { "pci-map-in", ob_pci_bridge_map_in },
+ { "map-in", ob_pci_bridge_map_in },
+ { "map-out", ob_pci_bridge_map_out },
{ "dma-alloc", ob_pci_dma_alloc },
{ "dma-free", ob_pci_dma_free },
{ "dma-map-in", ob_pci_dma_map_in },
diff --git a/drivers/pci.fs b/drivers/pci.fs
index a7b56e1..327c9c9 100644
--- a/drivers/pci.fs
+++ b/drivers/pci.fs
@@ -37,4 +37,45 @@
then
;
+: pci-map-in ( addr.lo addr.mid addr.hi size -- virt )
+ \ Ignore everything but addr.hi and find assigned addr for BAR
+ drop nip nip
+ \ Save my-self and set it to same as active package because otherwise
+ \ decode-phys below seems to be confused. Maybe this should not be needed
+ my-self swap active-package ihandle>phandle to my-self
+ " assigned-addresses" active-package get-package-property 0= if
+ begin
+ decode-phys ( bar prop prop-len phys.lo phys.mid phys.hi )
+ dup 0fffffff and 6 pick 0fffffff and = if
+ 2drop -rot
+ decode-int drop decode-int drop 2drop
+ ( bar addr.lo )
+ \ Now translate addr.lo, This may be wrong
+ \ maybe we should look at parent's ranges instead?
+ over 18 rshift 3 and 1 = if
+ " reg" active-package parent get-package-property 0= if
+ ( bar addr.lo prop prop-len reg.addr reg.size )
+ decode-int -rot decode-int 3drop
+ +
+ then
+ then
+ nip swap to my-self
+ exit
+ else
+ 3drop \ no match, try next
+ then
+ \ Drop the size as we don't need it
+ decode-int drop decode-int drop
+ dup 0=
+ until
+ 3drop
+ to my-self
+ -1 \ not found
+ else
+ drop
+ to my-self
+ -1 \ could not find assigned-addresses
+ then
+ ;
+
[THEN]
diff --git a/drivers/vga.fs b/drivers/vga.fs
index 53dcff0..f3ffda7 100644
--- a/drivers/vga.fs
+++ b/drivers/vga.fs
@@ -146,14 +146,14 @@ defer vbe-iow!
: map-fb ( -- )
cfg-bar0 pci-bar>pci-addr if \ ( pci-addr.lo pci-addr.mid pci-addr.hi size )
- " pci-map-in" $call-parent
+ " map-in" $call-parent
to fb-addr
then
;
: map-mmio ( -- )
cfg-bar2 pci-bar>pci-addr if \ ( pci-addr.lo pci-addr.mid pci-addr.hi size )
- " pci-map-in" $call-parent
+ " map-in" $call-parent
to mmio-addr
then
;
diff --git a/forth/device/other.fs b/forth/device/other.fs
index 1bed9b8..0ff34b6 100644
--- a/forth/device/other.fs
+++ b/forth/device/other.fs
@@ -58,21 +58,27 @@ defer (poke)
\ 5.3.7.2 Device-register access
: rb@ ( addr -- byte )
+ ioc@
;
: rw@ ( waddr -- w )
+ iow@
;
: rl@ ( qaddr -- quad )
+ iol@
;
: rb! ( byte addr -- )
+ ioc!
;
: rw! ( w waddr -- )
+ iow!
;
: rl! ( quad qaddr -- )
+ iol!
;
: rx@ ( oaddr - o )
--
2.13.7
2 months, 4 weeks
- 2
- 2
[PATCH] admin/devices.fs: Format assigned-addresses property
by BALATON Zoltan
To help reading property listing also format assigned-addresses
property the same way as reg was already formatted.
Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu>
---
Actually wanted to improve printing of ranges but I could not do that
this one is simpler though.
forth/admin/devices.fs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/forth/admin/devices.fs b/forth/admin/devices.fs
index 6f9e8ef..38f6ad6 100644
--- a/forth/admin/devices.fs
+++ b/forth/admin/devices.fs
@@ -417,7 +417,7 @@
\ This function hardwires data formats to particular node properties
: (.property-by-name) ( name-str name-len data len -- )
- 2over " reg" strcmp 0= if
+ 2over 2dup " reg" strcmp 0= -rot " assigned-addresses" strcmp 0= or if
my-#acells my-#scells 2swap .p-reg
2drop exit
then
--
2.13.7
2 months, 4 weeks
- 2
- 4